aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-09-05 23:36:14 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-09-05 23:36:14 +0000
commit7441b19d0c6f944b8547725f1f51349c79608576 (patch)
tree8beba648391739ae07e3e7605dc41ed832fea709 /activesupport/lib
parent951b4d279953f05188327294ff5174c846f624a0 (diff)
downloadrails-7441b19d0c6f944b8547725f1f51349c79608576.tar.gz
rails-7441b19d0c6f944b8547725f1f51349c79608576.tar.bz2
rails-7441b19d0c6f944b8547725f1f51349c79608576.zip
Fix logic error in determining what was loaded by a given file. Closes #6039.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5035 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/dependencies.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index bccbd549b1..1b027aa75b 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -188,7 +188,7 @@ module Dependencies #:nodoc:
result = load path
- newly_defined_paths = const_paths.select(&method(:qualified_const_defined?))
+ newly_defined_paths = undefined_before.select(&method(:qualified_const_defined?))
autoloaded_constants.concat newly_defined_paths
autoloaded_constants.uniq!
log "loading #{path} defined #{newly_defined_paths * ', '}" unless newly_defined_paths.empty?