aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-10-30 15:25:36 -0500
committerJoshua Peek <josh@joshpeek.com>2008-10-30 15:26:29 -0500
commit2092687bcb35a3d30e1d05d3f5f461d8f4e8f9b7 (patch)
tree1fe004d07b25d336492f0583fc5c3a4241c0a61a /actionpack/lib/action_controller
parent7857e42103ca1ab9e8d7f363527ddb2af3e8bd65 (diff)
downloadrails-2092687bcb35a3d30e1d05d3f5f461d8f4e8f9b7.tar.gz
rails-2092687bcb35a3d30e1d05d3f5f461d8f4e8f9b7.tar.bz2
rails-2092687bcb35a3d30e1d05d3f5f461d8f4e8f9b7.zip
Ensure content type gets reset after render_to_string [#1182 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e9429d3bb2..e73fc32c59 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -933,6 +933,7 @@ module ActionController #:nodoc:
def render_to_string(options = nil, &block) #:doc:
render(options, &block)
ensure
+ response.content_type = nil
erase_render_results
reset_variables_added_to_assigns
end