diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-31 18:41:45 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-31 18:41:45 +0100 |
| commit | c50667e96167efefb0aab4d99f3c04149e87bf6f (patch) | |
| tree | d1b555771890e83882c34aafe7fbe1144cc5832a /actionpack/lib/action_controller/base.rb | |
| parent | e466ae13e9b6d901e3e39bb9ceeafd83e266ce81 (diff) | |
| parent | fc215de52fe1967bb00b5500c3d0dd2ad55880ac (diff) | |
| download | rails-c50667e96167efefb0aab4d99f3c04149e87bf6f.tar.gz rails-c50667e96167efefb0aab4d99f3c04149e87bf6f.tar.bz2 rails-c50667e96167efefb0aab4d99f3c04149e87bf6f.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 |
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 |