github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-27 23:38:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Inline commonly-called template presence checks. Closes #2882.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2005-11-16 09:03:00 +00:00
parent ede505592c
commit c63f3bdc7a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,6 +1,6 @@
*SVN*
* Performance tweaks: use Set instead of Array to speed up prototype helper include? calls. Avoid logging code if logger is nil. #2880, #2881 [Stefan Kaes]
* Performance tweaks: use Set instead of Array to speed up prototype helper include? calls. Avoid logging code if logger is nil. Inline commonly-called template presence checks. #2880, #2881, #2882 [Stefan Kaes]
* MemCache store may be given multiple addresses. #2869 [Ryan Carver <ryan@fivesevensix.com>]

4
actionpack/lib/action_view/base.rb
View File

@@ -273,9 +273,9 @@ module ActionView #:nodoc:
def pick_template_extension(template_path)#:nodoc:
if match = delegate_template_exists?(template_path)
match.first
elsif erb_template_exists?(template_path)
elsif template_exists?(template_path, :rhtml)
'rhtml'
elsif builder_template_exists?(template_path)
elsif template_exists?(template_path, :rxml)
'rxml'
else
raise ActionViewError, "No rhtml, rxml, or delegate template found for #{template_path}"