Permalink
Browse files

_conditional_callback_around methods should not be included in action…

…_methods
  • Loading branch information...
1 parent 1b4e6ca commit b9cf4b04ef2eb50247b7bf74beea60598ebe5dcd @willbryant committed Oct 14, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/abstract_controller/base.rb
View
2 actionpack/lib/abstract_controller/base.rb
@@ -72,7 +72,7 @@ def action_methods
hidden_actions.to_a
# Clear out AS callback method pollution
- methods.reject { |method| method =~ /_one_time_conditions/ }
+ methods.reject { |method| method =~ /_one_time_conditions/ || method =~ /_conditional_callback_around/ }
end
end

0 comments on commit b9cf4b0

Please sign in to comment.