Silence errors occurring when reloading classes

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@27 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 3312d41d06..7238f97067 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -549,7 +549,7 @@ module ActiveRecord #:nodoc:
       def require_or_load(file_name)
         if !associations_loaded.include?(file_name)
           associations_loaded << file_name
-          reload_associations ? load("#{file_name}.rb") : require(file_name)
+          reload_associations ? silence_warnings { load("#{file_name}.rb") } : require(file_name)
         end
       end
       
@@ -1048,4 +1048,4 @@ module ActiveRecord #:nodoc:
         string[0..3] == "--- "
       end
   end
-end
+end
\ No newline at end of file