Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove unused use_full_path argument

  • Loading branch information...
commit cb25c4e5849dc3b803784ad985ea1cb4e43b0c74 1 parent f7d9e09
@lifo lifo authored
Showing with 5 additions and 5 deletions.
  1. +5 −5 actionpack/lib/action_controller/base.rb
View
10 actionpack/lib/action_controller/base.rb
@@ -863,7 +863,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
raise DoubleRenderError, "Can only render or redirect once per action" if performed?
if options.nil?
- return render_for_file(default_template_name, nil, true)
+ return render_for_file(default_template_name)
elsif !extra_options.is_a?(Hash)
raise RenderError, "You called render with invalid options : #{options.inspect}, #{extra_options.inspect}"
else
@@ -887,10 +887,10 @@ def render(options = nil, extra_options = {}, &block) #:doc:
else
if file = options[:file]
- render_for_file(file, options[:status], nil, options[:locals] || {})
+ render_for_file(file, options[:status], options[:locals] || {})
elsif template = options[:template]
- render_for_file(template, options[:status], true, options[:locals] || {})
+ render_for_file(template, options[:status], options[:locals] || {})
elsif inline = options[:inline]
add_variables_to_assigns
@@ -926,7 +926,7 @@ def render(options = nil, extra_options = {}, &block) #:doc:
render_for_text(nil, options[:status])
else
- render_for_file(default_template_name, options[:status], true)
+ render_for_file(default_template_name, options[:status])
end
end
end
@@ -1122,7 +1122,7 @@ def reset_session #:doc:
private
- def render_for_file(template_path, status = nil, use_full_path = nil, locals = {}) #:nodoc:
+ def render_for_file(template_path, status = nil, locals = {}) #:nodoc:
add_variables_to_assigns
logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger
render_for_text(@template.render(:file => template_path, :locals => locals), status)
Please sign in to comment.
Something went wrong with that request. Please try again.