aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb2
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb6
2 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index f8ddc8da09..13139358c7 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -52,7 +52,7 @@ module ActionController
def method_for_action(action_name)
super || begin
- if view_paths.exists?(action_name.to_s, {:formats => formats}, controller_path)
+ if view_paths.exists?(action_name.to_s, details_for_render, controller_path)
"default_render"
end
end
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index a026289ee5..6e5379745b 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -23,10 +23,14 @@ module ActionController
def _render_partial(options)
options[:partial] = action_name if options[:partial] == true
- options[:_details] = {:formats => formats}
+ options[:_details] = details_for_render
super
end
+ def details_for_render
+ {:formats => formats}
+ end
+
def format_for_text
formats.first
end