Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed template_public? because it will always be true since the def…

…ault template is never a partial
  • Loading branch information...
commit 0096f5586987b720ca24c09103c9371f64ed26e5 1 parent ba516b4
@josh josh authored
View
6 actionpack/lib/action_controller/base.rb
@@ -1189,7 +1189,7 @@ def perform_action
elsif respond_to? :method_missing
method_missing action_name
default_render unless performed?
- elsif template_exists? && template_public?
+ elsif template_exists?
default_render
else
raise UnknownAction, "No action responded to #{action_name}. Actions: #{action_methods.sort.to_sentence}", caller
@@ -1264,10 +1264,6 @@ def template_exists?(template_name = default_template_name)
@template.file_exists?(template_name)
end
- def template_public?(template_name = default_template_name)
- @template.file_public?(template_name)
- end
-
def template_exempt_from_layout?(template_name = default_template_name)
template_name = @template.pick_template(template_name).to_s if @template
@@exempt_from_layout.any? { |ext| template_name =~ ext }
View
5 actionpack/lib/action_view/base.rb
@@ -275,11 +275,6 @@ def render(options = {}, local_assigns = {}, &block) #:nodoc:
end
end
- # Returns true is the file may be rendered implicitly.
- def file_public?(template_path)#:nodoc:
- template_path.split('/').last[0,1] != '_'
- end
-
# The format to be used when choosing between multiple templates with
# the same name but differing formats. See +Request#template_format+
# for more details.
Please sign in to comment.
Something went wrong with that request. Please try again.