aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index e5dea1bae2..83bb318ce5 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -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}"