Ticket #8867: clear_layout_conditions.diff

vendor/rails/actionpack/lib/action_controller/layout.rb

@@ -168 +168 @@
-      # when the layout<tt>yield</tt>'s. This layout can itself depend on instance variables assigned during action
-      # performance and have access to them as any normal template would.
-      def layout(template_name, conditions = {})
+        write_inheritable_attribute "layout_conditions", {}
-        add_layout_conditions(conditions)
-        write_inheritable_attribute "layout", template_name
-      end