Merge commit 'rails/master'

2 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index f6d021c92a..95c56faf9c 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -2,7 +2,7 @@ module ActionView #:nodoc:
   class PathSet < Array #:nodoc:
     def self.type_cast(obj)
       if obj.is_a?(String)
-        cache = !Object.const_defined?(:Rails) || Rails.configuration.cache_classes
+        cache = !defined?(Rails) || !Rails.respond_to?(:configuration) || Rails.configuration.cache_classes
         Template::FileSystemPathWithFallback.new(obj, :cache => cache)
       else
         obj
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index f81174d707..a777021a12 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -1,9 +1,12 @@
 module ActionView #:nodoc:
   class TextTemplate < String #:nodoc:
+
+    def identifier() self end
     
     def render(*) self end
     
-    def exempt_from_layout?() false end
-    
+    def mime_type() Mime::HTML end
+      
+    def partial?() false end
   end
 end