diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-11-30 18:52:20 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-11-30 18:52:20 +0000 |
| commit | d82f73ecabe71fc3814eff0bd26f4f431f690266 (patch) | |
| tree | 568ad503cf10c54acd2a945c317d81887b1eb20b /actionpack/lib/action_controller/dependencies.rb | |
| parent | 5b38d8557122723aa7c11c28d4c2c93464982766 (diff) | |
| download | rails-d82f73ecabe71fc3814eff0bd26f4f431f690266.tar.gz rails-d82f73ecabe71fc3814eff0bd26f4f431f690266.tar.bz2 rails-d82f73ecabe71fc3814eff0bd26f4f431f690266.zip | |
Abolished ActionController::Base.require_or_load in favor of require_dependency and ActiveRecord::Base.require_or_load in favor of require_association. Both methods are now also available in the global namespace when you need to require dependencies or associations outside of whats done automatically.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@32 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/dependencies.rb')
| -rw-r--r-- | actionpack/lib/action_controller/dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dependencies.rb b/actionpack/lib/action_controller/dependencies.rb index 6f092500d1..f087354c63 100644 --- a/actionpack/lib/action_controller/dependencies.rb +++ b/actionpack/lib/action_controller/dependencies.rb @@ -38,7 +38,7 @@ module ActionController #:nodoc: def require_dependencies(layer, dependencies) dependencies.flatten.each do |dependency| begin - require_or_load(dependency.to_s) + require_dependency(dependency.to_s) rescue LoadError raise LoadError, "Missing #{layer} #{dependency}.rb" end |