aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrady Bouchard <brady@lunardawn.ca>2008-12-17 10:23:59 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-17 10:23:59 -0600
commit33f76bb25a973a4707437064e2f963c521413fcb (patch)
tree9f3ca41648223d9e5f9e114938a7503767a7285a
parentf23c2796ee4a217d48bcefbc0056aaab6b1b64fa (diff)
downloadrails-33f76bb25a973a4707437064e2f963c521413fcb.tar.gz
rails-33f76bb25a973a4707437064e2f963c521413fcb.tar.bz2
rails-33f76bb25a973a4707437064e2f963c521413fcb.zip
Ensure error file is sent with a 'text/html' content type [#1478 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
-rw-r--r--actionpack/lib/action_controller/rescue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index 24ee160ee8..b8b0175b5f 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -104,7 +104,7 @@ module ActionController #:nodoc:
status = interpret_status(status_code)
path = "#{Rails.public_path}/#{status[0,3]}.html"
if File.exist?(path)
- render :file => path, :status => status
+ render :file => path, :status => status, :content_type => Mime::HTML
else
head status
end