Added failing tests for iphone

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 11 insertions, 4 deletions

diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index f12b3f9b80..9cd7d0e8cf 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -234,10 +234,9 @@ module ActionController #:nodoc:
 
     protected
       def render_with_a_layout(options = nil, &block) #:nodoc:
-        if template_with_options = options.is_a?(Hash)
-          response.template.template_format = options[:content_type].to_sym if options[:content_type]
-        end
-
+        template_with_options = options.is_a?(Hash)
+        set_template_format(options)
+        
         if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options))
           assert_existence_of_template_file(layout)
 
@@ -307,5 +306,13 @@ module ActionController #:nodoc:
           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
\ No newline at end of file