aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base/compatibility.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-16 13:54:55 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-16 13:54:55 -0700
commit315147fcb5be2a937dcceb785de04a97616c49d0 (patch)
tree4502e8242122230848717c2b4cd11b0773425613 /actionpack/lib/action_controller/base/compatibility.rb
parentdd58f4021da30af7f40ee139e7487b887cac44e9 (diff)
downloadrails-315147fcb5be2a937dcceb785de04a97616c49d0.tar.gz
rails-315147fcb5be2a937dcceb785de04a97616c49d0.tar.bz2
rails-315147fcb5be2a937dcceb785de04a97616c49d0.zip
Move the exceptions for missing template into Compatibility in prep for moving it into a "not-production" module
Diffstat (limited to 'actionpack/lib/action_controller/base/compatibility.rb')
-rw-r--r--actionpack/lib/action_controller/base/compatibility.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
index 29ba43a879..085db284e4 100644
--- a/actionpack/lib/action_controller/base/compatibility.rb
+++ b/actionpack/lib/action_controller/base/compatibility.rb
@@ -118,6 +118,13 @@ module ActionController
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_by_parts(_layout({}), {})
+ end
def performed?
response_body