aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG4
-rwxr-xr-xactionpack/lib/action_controller/base.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 6b2c6e41e3..77cb4ee6f1 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,4 +1,6 @@
-*CVS*
+*SVN*
+
+* Added the opportunity to defined method_missing on a controller which will handle all requests for actions not otherwise defined #223 [timb]
* Fixed AbstractRequest#remote_ip for users going through proxies - Patch #228 [Eric Hodel]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 0cbcbbf688..4816ef7f71 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -599,7 +599,7 @@ module ActionController #:nodoc:
end
def perform_action
- if action_methods.include?(action_name)
+ if action_methods.include?(action_name) || action_methods.include?('method_missing')
send(action_name)
render unless @performed_render || @performed_redirect
elsif template_exists? && template_public?