2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index 9c8b8ade1e..623b9ff6b0 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -57,6 +57,10 @@ module ActionView #:nodoc:
         end
       end
 
+      def to_str
+        path.to_str
+      end
+
       def ==(path)
         to_str == path.to_str
       end
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index e32b7688d0..93748638c3 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -105,7 +105,7 @@ module ActionView #:nodoc:
       def find_full_path(path, load_paths)
         load_paths = Array(load_paths) + [nil]
         load_paths.each do |load_path|
-          file = [load_path, path].compact.join('/')
+          file = load_path ? "#{load_path.to_str}/#{path}" : path
           return load_path, file if File.file?(file)
         end
         raise MissingTemplate.new(load_paths, path)