Skip to content
Browse files

Merge [5907] from trunk. References #6482.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5908 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent dd605e9 commit 06c7584fba5e1e41160a5340e211df39d91e35bb @jeremy jeremy committed Jan 12, 2007
Showing with 1 addition and 1 deletion.
  1. +1 −1 activerecord/lib/active_record/base.rb
View
2 activerecord/lib/active_record/base.rb
@@ -1140,7 +1140,7 @@ def add_limit!(sql, options, scope = :auto)
# The optional scope argument is for the current :find scope.
# The :lock option has precedence over a scoped :lock.
def add_lock!(sql, options, scope = :auto)
- scope = scope(:find) if :auto == :scope
+ scope = scope(:find) if :auto == scope
options = options.reverse_merge(:lock => scope[:lock]) if scope
connection.add_lock!(sql, options)
end

0 comments on commit 06c7584

Please sign in to comment.
Something went wrong with that request. Please try again.