From 0e063f435ce31a091d1097156172d551bd9d9d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 30 Jan 2010 16:35:22 +0100 Subject: Fix some backward incompatible behavior on AM. --- actionpack/lib/action_controller/metal/compatibility.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'actionpack/lib/action_controller/metal/compatibility.rb') 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 -- cgit v1.2.3