Do not allow templates coming from Fallback resolvers to store a virtual path.

1 files changed, 13 insertions, 0 deletions

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 5c6877a923..7707dbcf98 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -135,6 +135,7 @@ module ActionView
     end
   end
 
+  # A resolver that loads files from the filesystem.
   class FileSystemResolver < PathResolver
     def initialize(path)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
@@ -152,4 +153,16 @@ module ActionView
     end
     alias :== :eql?
   end
+
+  # The same as FileSystemResolver but does not allow templates to store
+  # a virtual path since it is invalid for such resolvers.
+  class FallbackFileSystemResolver < FileSystemResolver
+    def self.instances
+      [new(""), new("/")]
+    end
+
+    def decorate(*)
+      super.each { |t| t.virtual_path = nil }
+    end
+  end
 end