diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-23 18:13:46 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-23 18:13:46 -0300 |
| commit | b9088dce07f8525cdb84a1312a77b81db79067d6 (patch) | |
| tree | 72ace069842b074981ba814ef1c335271176ce27 /actionpack/lib/action_view/template/text.rb | |
| parent | 4864f92ee34e840307d968fa8b04972b6d786fe8 (diff) | |
| parent | 4417a19b035d73eb46a5e06e296a4b1c8091bef1 (diff) | |
| download | rails-b9088dce07f8525cdb84a1312a77b81db79067d6.tar.gz rails-b9088dce07f8525cdb84a1312a77b81db79067d6.tar.bz2 rails-b9088dce07f8525cdb84a1312a77b81db79067d6.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_view/template/text.rb')
| -rw-r--r-- | actionpack/lib/action_view/template/text.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb index fd57b1677e..81944ff546 100644 --- a/actionpack/lib/action_view/template/text.rb +++ b/actionpack/lib/action_view/template/text.rb @@ -3,7 +3,7 @@ module ActionView #:nodoc: def initialize(string, content_type = Mime[:html]) super(string.to_s) - @content_type = Mime[content_type] + @content_type = Mime[content_type] || content_type end def details |