Ensure ActionView::PathSet::Path is not initialized with a precompiled path

2 files changed, 4 insertions, 1 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index bf60e2f3d5..a43296461b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -426,7 +426,8 @@ module ActionMailer #:nodoc:
       end
 
       def template_root=(root)
-        write_inheritable_attribute(:template_root, ActionView::PathSet::Path.new(root))
+        root = ActionView::PathSet::Path.new(root) if root.is_a?(String)
+        write_inheritable_attribute(:template_root, root)
       end
     end
 
diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index c7a5df762f..78548d4aa2 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -28,6 +28,8 @@ module ActionView #:nodoc:
       delegate :to_s, :to_str, :inspect, :to => :path
 
       def initialize(path)
+        raise ArgumentError, "path already is a Path class" if path.is_a?(Path)
+
         @path = path.freeze
         reload!
       end