diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-30 16:35:22 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-30 16:35:22 +0100 |
commit | 0e063f435ce31a091d1097156172d551bd9d9d37 (patch) | |
tree | a6435316368400efc7985a2333f3551dd0b89a9d /actionpack/lib/action_controller/metal/compatibility.rb | |
parent | d6e2f5013cdc0aa830d167a84582f48dc636dc81 (diff) | |
download | rails-0e063f435ce31a091d1097156172d551bd9d9d37.tar.gz rails-0e063f435ce31a091d1097156172d551bd9d9d37.tar.bz2 rails-0e063f435ce31a091d1097156172d551bd9d9d37.zip |
Fix some backward incompatible behavior on AM.
Diffstat (limited to 'actionpack/lib/action_controller/metal/compatibility.rb')
-rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 0e869e4e87..2be0fa097e 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -2,6 +2,8 @@ module ActionController module Compatibility extend ActiveSupport::Concern + include AbstractController::Compatibility + class ::ActionController::ActionControllerError < StandardError #:nodoc: end @@ -103,19 +105,6 @@ module ActionController super || (respond_to?(:method_missing) && "_handle_method_missing") end - def _find_layout(name, details) - details[:prefix] = nil if name =~ /\blayouts/ - super - end - - # Move this into a "don't run in production" module - def _default_layout(details, require_layout = false) - super - rescue ActionView::MissingTemplate - _find_layout(_layout({}), {}) - nil - end - def performed? response_body end |