aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-08 11:32:01 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-08 11:32:01 +0100
commit0a85380966e47a38292242e6c3b259d77c738ab5 (patch)
tree60945065b107368e6cd2f06b63cf40d16f6e88ac /actionpack/lib/action_view/template
parent34b2180451f842b180dd925bab10e8f4afa34490 (diff)
downloadrails-0a85380966e47a38292242e6c3b259d77c738ab5.tar.gz
rails-0a85380966e47a38292242e6c3b259d77c738ab5.tar.bz2
rails-0a85380966e47a38292242e6c3b259d77c738ab5.zip
Finally moved the find template logic to the views.
Diffstat (limited to 'actionpack/lib/action_view/template')
-rw-r--r--actionpack/lib/action_view/template/text.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index 2abb352d4e..5978a8a3ac 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,11 +1,10 @@
module ActionView #:nodoc:
class Template
class Text < String #:nodoc:
- HTML = Mime[:html]
-
- def initialize(string, content_type = HTML)
+ def initialize(string, content_type = nil)
super(string.to_s)
- @content_type = Mime[content_type] || content_type
+ @content_type = Mime[content_type] || content_type if content_type
+ @content_type ||= Mime::TEXT
end
def details