diff options
author | Rick Olson <technoweenie@gmail.com> | 2007-02-04 22:27:45 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2007-02-04 22:27:45 +0000 |
commit | 92195e68a02715d29ef9d4b3bf66409c014f7174 (patch) | |
tree | be9288b47df99e88a97416fd8707466fd8d549d1 /actionpack/lib/action_controller/components.rb | |
parent | 517bf0814e95922d8675b20abc70fa0536044bbe (diff) | |
download | rails-92195e68a02715d29ef9d4b3bf66409c014f7174.tar.gz rails-92195e68a02715d29ef9d4b3bf66409c014f7174.tar.bz2 rails-92195e68a02715d29ef9d4b3bf66409c014f7174.zip |
Fix issue with deprecation messing up #template_root= usage. Add #prepend_view_path and #append_view_path to allow modification of a copy of the
superclass' view_paths. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
-rw-r--r-- | actionpack/lib/action_controller/components.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb index 5d5a48ebcc..e09b4ddd5f 100644 --- a/actionpack/lib/action_controller/components.rb +++ b/actionpack/lib/action_controller/components.rb @@ -77,8 +77,8 @@ module ActionController #:nodoc: def uses_component_template_root path_of_calling_controller = File.dirname(caller[1].split(/:\d+:/, 2).first) path_of_controller_root = path_of_calling_controller.sub(/#{Regexp.escape(File.dirname(controller_path))}$/, "") - - self.template_root = path_of_controller_root + prepend_view_path path_of_controller_root + view_paths.first end deprecate :uses_component_template_root => 'Components are deprecated and will be removed in Rails 2.0.' |