diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
| commit | c800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch) | |
| tree | 0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /actionpack/lib/abstract_controller | |
| parent | 7dba1599d9092a8362956a3fab23b2c60eedea63 (diff) | |
| parent | 46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff) | |
| download | rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2 rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip | |
Merge branch 'master' into asset-path-helper
Conflicts:
railties/test/application/configuration_test.rb
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/base.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb index 9c3960961b..388e043f0b 100644 --- a/actionpack/lib/abstract_controller/base.rb +++ b/actionpack/lib/abstract_controller/base.rb @@ -217,8 +217,10 @@ module AbstractController # * <tt>string</tt> - The name of the method that handles the action # * <tt>nil</tt> - No method name could be found. Raise ActionNotFound. def method_for_action(action_name) - if action_method?(action_name) then action_name - elsif respond_to?(:action_missing, true) then "_handle_action_missing" + if action_method?(action_name) + action_name + elsif respond_to?(:action_missing, true) + "_handle_action_missing" end end end |