aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base/renderer.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-07-29 19:31:03 +0200
committerYehuda Katz <wycats@gmail.com>2009-07-29 12:06:04 -0700
commitd209aea7d88849b7c7a080d729045ce7c051ef1f (patch)
tree4bc7ef559c9617c4835e4b6d585b460caf39520e /actionpack/lib/action_controller/base/renderer.rb
parentfa0cf663fe6a6393a3ba117505703e587da4ddc5 (diff)
downloadrails-d209aea7d88849b7c7a080d729045ce7c051ef1f.tar.gz
rails-d209aea7d88849b7c7a080d729045ce7c051ef1f.tar.bz2
rails-d209aea7d88849b7c7a080d729045ce7c051ef1f.zip
Remove last TODO.
Signed-off-by: Yehuda Katz <wycats@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/base/renderer.rb')
-rw-r--r--actionpack/lib/action_controller/base/renderer.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base/renderer.rb b/actionpack/lib/action_controller/base/renderer.rb
index 2fab501302..572da451ff 100644
--- a/actionpack/lib/action_controller/base/renderer.rb
+++ b/actionpack/lib/action_controller/base/renderer.rb
@@ -11,11 +11,10 @@ module ActionController
def render(options)
super
- options[:_template] ||= _action_view._partial
self.content_type ||= begin
mime = options[:_template].mime_type
formats.include?(mime && mime.to_sym) || formats.include?(:all) ? mime : Mime::Type.lookup_by_extension(formats.first)
- end
+ end.to_s
response_body
end