Merge commit 'brynary/2-3-stable' into 2-3-stable

rails · Nov 9, 2009 · 97a7cdc · 97a7cdc
2 parents fd0289f + b68861a
commit 97a7cdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
@@ -198,7 +198,7 @@ def self.cache_template_loading?
 
     attr_internal :request
 
-    delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
+    delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
              :flash, :logger, :action_name, :controller_name, :to => :controller
 
     module CompiledTemplates #:nodoc:

diff --git a/actionpack/lib/action_view/erb/util.rb b/actionpack/lib/action_view/erb/util.rb
@@ -18,6 +18,7 @@ def html_escape(s)
       s.to_s.gsub(/[&"><]/) { |special| HTML_ESCAPE[special] }
     end
 
+    undef :h
     alias h html_escape
 
     module_function :html_escape

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
@@ -64,7 +64,7 @@ def initialize(path)
 
       def load!
         return if @loaded
-        
+
         @paths = {}
         templates_in_path do |template|
           template.load!
@@ -108,8 +108,9 @@ def self.exempt_from_layout(*extensions)
       @@exempt_from_layout.merge(regexps)
     end
 
-    attr_accessor :template_path, :filename, :load_path, :base_path
+    attr_accessor :template_path, :load_path, :base_path
     attr_accessor :locale, :name, :format, :extension
+    attr_writer :filename
     delegate :to_s, :to => :path
 
     def initialize(template_path, load_path = nil)