aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2009-08-07 17:13:44 +0200
committerJosé Valim <jose.valim@gmail.com>2009-08-07 17:13:44 +0200
commite45e120af99f0d598e9fcdc24ec06cdd3615ba06 (patch)
tree0f3618e1cb067addc9084b173d89994839b2a2ef /actionpack/lib/action_controller
parentdac8927b0576bff89ba3a4fcbf502dffc9b39e89 (diff)
parentbfe58ac05d4b7ba5d5c04c3aa9a719e340b2111e (diff)
downloadrails-e45e120af99f0d598e9fcdc24ec06cdd3615ba06.tar.gz
rails-e45e120af99f0d598e9fcdc24ec06cdd3615ba06.tar.bz2
rails-e45e120af99f0d598e9fcdc24ec06cdd3615ba06.zip
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/renderer.rb15
1 files changed, 2 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/metal/renderer.rb b/actionpack/lib/action_controller/metal/renderer.rb
index 5a458764ad..31ba7e582a 100644
--- a/actionpack/lib/action_controller/metal/renderer.rb
+++ b/actionpack/lib/action_controller/metal/renderer.rb
@@ -22,7 +22,8 @@ module ActionController
_process_options(options)
if options.key?(:partial)
- _render_partial(options[:partial], options)
+ options[:partial] = action_name if options[:partial] == true
+ options[:_details] = {:formats => formats}
end
super
@@ -53,18 +54,6 @@ module ActionController
end
def _render_partial(partial, options)
- case partial
- when true
- options[:_prefix] = _prefix
- when String
- options[:_prefix] = _prefix unless partial.include?(?/)
- options[:_template_name] = partial
- else
- options[:_partial_object] = true
- return
- end
-
- options[:_partial] = options[:object] || true
end
def _process_options(options)