aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/layouts.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-26 16:34:25 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-26 16:34:25 +0100
commite274eb1df1dcf526febb7c3a1a8dc2c02325d68c (patch)
tree7f4947805a7ab03cdab0943635f4a3f9aed310fa /actionpack/lib/abstract_controller/layouts.rb
parent48a3985dd77160b34fc3ac35a75d850d8a2711f0 (diff)
downloadrails-e274eb1df1dcf526febb7c3a1a8dc2c02325d68c.tar.gz
rails-e274eb1df1dcf526febb7c3a1a8dc2c02325d68c.tar.bz2
rails-e274eb1df1dcf526febb7c3a1a8dc2c02325d68c.zip
Bring layouts with proc back alive.
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
-rw-r--r--actionpack/lib/abstract_controller/layouts.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 6fbf6bc392..56ddf9bf01 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -270,6 +270,9 @@ module AbstractController
end
end
ruby_eval
+ when Proc
+ define_method :_layout_from_proc, &@_layout
+ self.class_eval %{def _layout(details) _layout_from_proc(self) end}
when false
self.class_eval %{def _layout(details) end}
when true