aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/layouts.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-08-17 19:46:06 -0300
committerEmilio Tagua <miloops@gmail.com>2009-08-17 19:46:06 -0300
commitc01c8967a02537f132d437d5ae15332982119651 (patch)
tree76ed47f6bffd5fe1aa11c65cd32b222d881f43aa /actionpack/lib/abstract_controller/layouts.rb
parent770fca10fba68fa14308f33e923493e6f63bfa35 (diff)
parentccf28d2499d1b4e2aba41291eb800e0e02120923 (diff)
downloadrails-c01c8967a02537f132d437d5ae15332982119651.tar.gz
rails-c01c8967a02537f132d437d5ae15332982119651.tar.bz2
rails-c01c8967a02537f132d437d5ae15332982119651.zip
Merge commit 'rails/master'
Conflicts: activerecord/lib/active_record/calculations.rb
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
-rw-r--r--actionpack/lib/abstract_controller/layouts.rb13
1 files changed, 9 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index ac2154dffc..a8bd2b80e1 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -19,15 +19,20 @@ module AbstractController
end
end
+ def clear_template_caches!
+ @found_layouts.clear if @found_layouts
+ super
+ end
+
def cache_layout(details)
layout = @found_layouts
- values = details.values_at(:formats, :locale)
+ key = Thread.current[:format_locale_key]
# Cache nil
- if layout.key?(values)
- return layout[values]
+ if layout.key?(key)
+ return layout[key]
else
- layout[values] = yield
+ layout[key] = yield
end
end