diff options
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 5ab761932f..5319ec6ec2 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -421,7 +421,7 @@ module ActiveRecord #:nodoc: # person.save! # end def find(*args) - options = extract_options_from_args!(args) + options = args.extract_options! validate_find_options(options) set_readonly_option!(options) @@ -1604,10 +1604,6 @@ module ActiveRecord #:nodoc: end end - def extract_options_from_args!(args) #:nodoc: - args.last.is_a?(Hash) ? args.pop : {} - end - VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :group, :from, :lock ] |