diff options
| author | David Heinemeier Hansson <david@envy8.local> | 2008-04-27 17:16:05 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@envy8.local> | 2008-04-27 17:16:05 -0500 |
| commit | 027f0f822f418aba41f1d52f9d5895e34fae0310 (patch) | |
| tree | 91b50adfff2f836ccb49e3fdfda082f31cceaf94 /activerecord/lib/active_record/base.rb | |
| parent | 162c7c1908946cfb48c201cfc5a4976a33c8bff1 (diff) | |
| parent | 7f4171da5e3ed5b3e038b95f8f5ae05ba6e21bef (diff) | |
| download | rails-027f0f822f418aba41f1d52f9d5895e34fae0310.tar.gz rails-027f0f822f418aba41f1d52f9d5895e34fae0310.tar.bz2 rails-027f0f822f418aba41f1d52f9d5895e34fae0310.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8bef5ed2ae..dfc0eac54d 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1272,7 +1272,7 @@ module ActiveRecord #:nodoc: private def find_initial(options) - options.update(:limit => 1) unless options[:include] + options.update(:limit => 1) find_every(options).first end |