Resurrecting 1.9 compatibility.

1 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/base/layout.rb b/actionpack/lib/action_controller/base/layout.rb
index 88a15aa6ca..4fcef6c5d9 100644
--- a/actionpack/lib/action_controller/base/layout.rb
+++ b/actionpack/lib/action_controller/base/layout.rb
@@ -174,7 +174,9 @@ module ActionController #:nodoc:
       end
 
       def default_layout(*args)
-        (@_memoized_default_layout ||= ::ActiveSupport::ConcurrentHash.new)[args] ||= memoized_default_layout(*args)
+        memoized_default_layout(*args)
+        @_memoized_default_layout ||= ::ActiveSupport::ConcurrentHash.new
+        @_memoized_default_layout[args] ||= memoized_default_layout(*args)
       end
 
       def memoized_find_layout(layout, formats) #:nodoc:
@@ -184,7 +186,8 @@ module ActionController #:nodoc:
       end
 
       def find_layout(*args)
-        (@_memoized_find_layout ||= ::ActiveSupport::ConcurrentHash.new)[args] ||= memoized_find_layout(*args)
+        @_memoized_find_layout ||= ::ActiveSupport::ConcurrentHash.new
+        @_memoized_find_layout[args] ||= memoized_find_layout(*args)
       end
 
       def layout_list #:nodoc:
@@ -222,7 +225,7 @@ module ActionController #:nodoc:
       self.class.find_layout(layout_name, formats)
     end
 
-    def _pick_layout(layout_name, implicit = false)
+    def _pick_layout(layout_name = nil, implicit = false)
       return unless layout_name || implicit
       layout_name = true if layout_name.nil?
       active_layout(layout_name) if action_has_layout? && layout_name