aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/mime_responds.rb2
-rw-r--r--actionpack/lib/action_view/base.rb20
2 files changed, 17 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb
index 7a60a5cc37..42b6e24205 100644
--- a/actionpack/lib/action_controller/mime_responds.rb
+++ b/actionpack/lib/action_controller/mime_responds.rb
@@ -50,4 +50,4 @@ module ActionController #:nodoc:
end
end
end
-end
+end \ No newline at end of file
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 2f0eaf367c..d2f4764575 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -216,8 +216,14 @@ module ActionView #:nodoc:
@first_render = template_path if @first_render.nil?
if use_full_path
- template_extension = pick_template_extension(template_path)
- template_file_name = full_template_path(template_path, template_extension)
+ template_path_without_extension, template_extension = template_path.split('.')
+
+ if template_extension
+ template_file_name = full_template_path(template_path_without_extension, template_extension)
+ else
+ template_extension = pick_template_extension(template_path)
+ template_file_name = full_template_path(template_path, template_extension)
+ end
else
template_file_name = template_path
template_extension = template_path.split('.').last
@@ -324,8 +330,14 @@ module ActionView #:nodoc:
end
def file_exists?(template_path)#:nodoc:
- %w(erb builder javascript delegate).any? do |template_type|
- send("#{template_type}_template_exists?", template_path)
+ template_file_name, template_file_extension = template_path.split(".")
+
+ if template_file_extension
+ template_exists?(template_file_name, template_file_extension)
+ else
+ %w(erb builder javascript delegate).any? do |template_type|
+ send("#{template_type}_template_exists?", template_path)
+ end
end
end