diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-08-21 21:34:03 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-08-21 21:34:03 -0500 |
commit | 0096f5586987b720ca24c09103c9371f64ed26e5 (patch) | |
tree | 49ea046d78a8175cc63e2004e26b5e1b479e24f8 /actionpack/lib/action_controller | |
parent | ba516b40f5867a68588c2fa5b6710dbfb97a12c6 (diff) | |
download | rails-0096f5586987b720ca24c09103c9371f64ed26e5.tar.gz rails-0096f5586987b720ca24c09103c9371f64ed26e5.tar.bz2 rails-0096f5586987b720ca24c09103c9371f64ed26e5.zip |
Removed template_public? because it will always be true since the default template is never a partial
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/base.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 5887e1e3b4..91023cd774 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1189,7 +1189,7 @@ module ActionController #:nodoc: 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 @@ module ActionController #:nodoc: @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 } |