Ticket #9564: default_layouts_with_register_alias.patch

actionpack/test/controller/mime_responds_test.rb

@@ -116 +116 @@
-  
-  def iphone_with_html_response_type 
-    Mime::Type.register_alias("text/html", :iphone)
-
+
+
-    respond_to do |type|
-      type.html   { @type = "Firefox" }
-      type.iphone { @type = "iPhone"  }

actionpack/lib/action_controller/layout.rb

@@ -234 +234 @@
-
-    protected
-      def render_with_a_layout(options = nil, &block) #:nodoc:
-
-
-
-
+
+
+
-        if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
-          assert_existence_of_template_file(layout)
-
@@ -307 +306 @@
-          self.class.send(:layout_directory_exists_cache)[File.dirname(template_path)]
-        end
-      end
+      
+      def set_template_format(options)
+        if options.is_a?(Hash) && options[:content_type]
+          response.template.template_format = options[:content_type].to_sym 
+        elsif params[:format]
+          response.template.template_format = Mime::Type.lookup(Mime::Type.lookup_by_extension(params[:format]).to_s).to_sym
+        end
+      end
-  end
-end