diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-19 06:01:57 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-19 06:01:57 +0000 |
commit | 88bc014acc82129e55a7ae7505cb62bacd0d685d (patch) | |
tree | 855c3779b5eb527ba70ace6901d73242a05be7f0 /actionpack/lib/action_controller/base.rb | |
parent | 16b129a68ca1770815107a3edb54090282349ba7 (diff) | |
download | rails-88bc014acc82129e55a7ae7505cb62bacd0d685d.tar.gz rails-88bc014acc82129e55a7ae7505cb62bacd0d685d.tar.bz2 rails-88bc014acc82129e55a7ae7505cb62bacd0d685d.zip |
Revert r8669 for now, breaks Action Mailer. Reopens #10800.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1321b002eb..5d4afc31fe 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -5,7 +5,6 @@ require 'action_controller/routing' require 'action_controller/resources' require 'action_controller/url_rewriter' require 'action_controller/status_codes' -require 'action_view/template_finder' require 'drb' require 'set' @@ -429,7 +428,6 @@ module ActionController #:nodoc: def view_paths=(value) @view_paths = value - ActionView::TemplateFinder.process_view_paths(value) end # Adds a view_path to the front of the view_paths array. @@ -442,7 +440,6 @@ module ActionController #:nodoc: def prepend_view_path(path) @view_paths = superclass.view_paths.dup if @view_paths.nil? view_paths.unshift(*path) - ActionView::TemplateFinder.process_view_paths(path) end # Adds a view_path to the end of the view_paths array. @@ -455,7 +452,6 @@ module ActionController #:nodoc: def append_view_path(path) @view_paths = superclass.view_paths.dup if @view_paths.nil? view_paths.push(*path) - ActionView::TemplateFinder.process_view_paths(path) end # Replace sensitive parameter data from the request log. @@ -646,11 +642,11 @@ module ActionController #:nodoc: # View load paths for controller. def view_paths - @template.finder.view_paths + @template.view_paths end def view_paths=(value) - @template.finder.view_paths = value # Mutex needed + @template.view_paths = value end # Adds a view_path to the front of the view_paths array. @@ -660,7 +656,7 @@ module ActionController #:nodoc: # self.prepend_view_path(["views/default", "views/custom"]) # def prepend_view_path(path) - @template.finder.prepend_view_path(path) # Mutex needed + @template.prepend_view_path(path) end # Adds a view_path to the end of the view_paths array. @@ -670,7 +666,7 @@ module ActionController #:nodoc: # self.append_view_path(["views/default", "views/custom"]) # def append_view_path(path) - @template.finder.append_view_path(path) # Mutex needed + @template.append_view_path(path) end protected @@ -1253,7 +1249,7 @@ module ActionController #:nodoc: end def template_exists?(template_name = default_template_name) - @template.finder.file_exists?(template_name) + @template.file_exists?(template_name) end def template_public?(template_name = default_template_name) @@ -1261,7 +1257,7 @@ module ActionController #:nodoc: end def template_exempt_from_layout?(template_name = default_template_name) - extension = @template && @template.finder.pick_template_extension(template_name) + extension = @template && @template.pick_template_extension(template_name) name_with_extension = !template_name.include?('.') && extension ? "#{template_name}.#{extension}" : template_name @@exempt_from_layout.any? { |ext| name_with_extension =~ ext } end |