aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2008-12-04 16:35:13 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-04 16:35:13 -0600
commitab211bf592f52fbde7853961030046ea1d387851 (patch)
tree7af69666251d6ef6f32cbfd9a16792127f0e6f08 /actionpack/lib/action_view
parent566a3dce6753eb71554d54e8883204e4868aa393 (diff)
downloadrails-ab211bf592f52fbde7853961030046ea1d387851.tar.gz
rails-ab211bf592f52fbde7853961030046ea1d387851.tar.bz2
rails-ab211bf592f52fbde7853961030046ea1d387851.zip
Fix rendering html partials from an rjs template
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index da1f283deb..a731fa3e1d 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -275,7 +275,7 @@ module ActionView #:nodoc:
if defined? @template_format
@template_format
elsif controller && controller.respond_to?(:request)
- @template_format = controller.request.template_format
+ @template_format = controller.request.template_format.to_sym
else
@template_format = :html
end