aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-20 16:55:26 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-20 16:55:26 +0000
commit5df6128bfdb7abaedc0a4f28aba1032a263b9a8a (patch)
treec27d7ba619efe40fde3ab052940fad965ac1948b /activerecord
parent3e5a8809873526c5761c1a0d7df6535602fd3f61 (diff)
downloadrails-5df6128bfdb7abaedc0a4f28aba1032a263b9a8a.tar.gz
rails-5df6128bfdb7abaedc0a4f28aba1032a263b9a8a.tar.bz2
rails-5df6128bfdb7abaedc0a4f28aba1032a263b9a8a.zip
Forgot a "or" in Inflector
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@235 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index a66a6c9a5c..0f40cce32c 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -19,7 +19,7 @@ class << Object #:nodoc:
def const_missing(class_id)
begin
- require_association(Inflect.underscore(Inflector.demodulize(class_id.to_s)))
+ require_association(Inflector.underscore(Inflector.demodulize(class_id.to_s)))
rescue LoadError
pre_association_const_missing(class_id)
end