aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/compatibility.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/abstract_controller/compatibility.rb')
-rw-r--r--actionpack/lib/abstract_controller/compatibility.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/compatibility.rb b/actionpack/lib/abstract_controller/compatibility.rb
new file mode 100644
index 0000000000..7fb93a0eb5
--- /dev/null
+++ b/actionpack/lib/abstract_controller/compatibility.rb
@@ -0,0 +1,18 @@
+module AbstractController
+ module Compatibility
+ extend ActiveSupport::Concern
+
+ 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
+ end
+end