diff options
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
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 |