diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-11-30 17:10:32 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-11-30 17:10:32 +0000 |
| commit | bcfd649de8850e3bfc9584eb12be8fe136ca6985 (patch) | |
| tree | 4dc2e1755d41103e135f59bbd3ba691f240206f6 /actionpack/lib/action_controller/base.rb | |
| parent | ac3c8a54f83418b5cac4b093fc1bae29f59f3a1f (diff) | |
| download | rails-bcfd649de8850e3bfc9584eb12be8fe136ca6985.tar.gz rails-bcfd649de8850e3bfc9584eb12be8fe136ca6985.tar.bz2 rails-bcfd649de8850e3bfc9584eb12be8fe136ca6985.zip | |
Silenced warnings from reloading files
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@28 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index a794272a9a..22eb7dc0a3 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -257,7 +257,7 @@ module ActionController #:nodoc: # Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false. def require_or_load(file_name) - reload_dependencies ? load("#{file_name}.rb") : require(file_name) + reload_dependencies ? silence_warnings { load("#{file_name}.rb") } : require(file_name) end end |