aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template/text.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 12:00:23 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 12:54:19 -0700
commit4fad953f90f82e860a69d67745887b40d5b15475 (patch)
treef66c81f08091549160ce064dce257017f5567282 /actionpack/lib/action_view/template/text.rb
parentde388ba864ab47cbb3d92b3a36af254540788ed5 (diff)
downloadrails-4fad953f90f82e860a69d67745887b40d5b15475.tar.gz
rails-4fad953f90f82e860a69d67745887b40d5b15475.tar.bz2
rails-4fad953f90f82e860a69d67745887b40d5b15475.zip
Fixing pending tests and fixed some formats / partial rendering semantics
Diffstat (limited to 'actionpack/lib/action_view/template/text.rb')
-rw-r--r--actionpack/lib/action_view/template/text.rb2
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