diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-02 03:39:56 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-06-02 03:39:56 +0000 |
| commit | 5c30352328f8a0223746139e024b6bea7b3d36c0 (patch) | |
| tree | 02be13f488a586b6c88fb85da06f6ed44ada32e9 /actionpack/lib/action_controller/base.rb | |
| parent | ace2a66f0cdda4b752b6226eadf07873c402e380 (diff) | |
| download | rails-5c30352328f8a0223746139e024b6bea7b3d36c0.tar.gz rails-5c30352328f8a0223746139e024b6bea7b3d36c0.tar.bz2 rails-5c30352328f8a0223746139e024b6bea7b3d36c0.zip | |
Added support for Mime objects in render :content_type option [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4404 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0902e70082..38a255192e 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -649,7 +649,7 @@ module ActionController #:nodoc: end if content_type = options[:content_type] - headers["Content-Type"] = content_type + headers["Content-Type"] = content_type.to_s end if text = options[:text] |