diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
| commit | 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (patch) | |
| tree | 024158d20563f34cca52a00b42aaa6c922777559 /actionpack/lib | |
| parent | 94a1309194fa5962e33d395ede14e94b237c54f5 (diff) | |
| download | rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.gz rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.bz2 rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.zip | |
New dependencies implementation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 2125637192..8c03f86609 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -206,7 +206,7 @@ module ActionController #:nodoc: class Base DEFAULT_RENDER_STATUS_CODE = "200 OK" - include Reloadable::Subclasses + include Reloadable::Deprecated # Determines whether the view has access to controller internals @request, @response, @session, and @template. # By default, it does. diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 0536cf43ff..5e1475357e 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -1,4 +1,5 @@ require 'fileutils' +require 'uri' module ActionController #:nodoc: # Caching is a cheap way of speeding up slow applications by keeping the result of calculations, renderings, and database calls @@ -578,7 +579,7 @@ module ActionController #:nodoc: # ActiveRecord::Observer will mark this class as reloadable even though it should not be. # However, subclasses of ActionController::Caching::Sweeper should be Reloadable - include Reloadable::Subclasses + include Reloadable::Deprecated def before(controller) self.controller = controller diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 91ca16913e..338d5980ab 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -183,7 +183,6 @@ module ActionController #:nodoc: private def inherited_with_layout(child) inherited_without_layout(child) - child.send :include, Reloadable layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '') child.layout(layout_match) unless layout_list.grep(%r{layouts/#{layout_match}\.[a-z][0-9a-z]*$}).empty? end |