1 files changed, 7 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
index 204f3f7fb3..53bedaa40a 100644
--- a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
@@ -1,5 +1,4 @@
 module ActionDispatch
-  # A simple Rack application that renders exceptions in the given public path.
   class PublicExceptions
     attr_accessor :public_path
 
@@ -12,26 +11,24 @@ module ActionDispatch
       status       = env["PATH_INFO"][1..-1]
       request      = ActionDispatch::Request.new(env)
       content_type = request.formats.first
-      format       = content_type && "to_#{content_type.to_sym}"
       body         = { :status => status, :error => exception.message }
 
-      render(status, body, :format => format, :content_type => content_type)
+      render(status, content_type, body)
     end
 
     private
 
-    def render(status, body, options)
-      format = options[:format]
-
+    def render(status, content_type, body)
+      format = content_type && "to_#{content_type.to_sym}"
       if format && body.respond_to?(format)
-        render_format(status, body.public_send(format), options)
+        render_format(status, content_type, body.public_send(format))
       else
         render_html(status)
       end
     end
 
-    def render_format(status, body, options)
-      [status, {'Content-Type' => "#{options[:content_type]}; charset=#{ActionDispatch::Response.default_charset}",
+    def render_format(status, content_type, body)
+      [status, {'Content-Type' => "#{content_type}; charset=#{ActionDispatch::Response.default_charset}",
                 'Content-Length' => body.bytesize.to_s}, [body]]
     end
 
@@ -41,8 +38,7 @@ module ActionDispatch
       path = "#{public_path}/#{status}.html" unless path && (found = File.exist?(path))
 
       if found || File.exist?(path)
-        body = File.read(path)
-        [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+        render_format(status, 'text/html', File.read(path))
       else
         [404, { "X-Cascade" => "pass" }, []]
       end