diff options
| author | Nate Wiger <nate_wiger@playstation.sony.com> | 2008-05-19 11:42:37 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-05-19 19:07:01 -0700 |
| commit | a34cc42a2c29928bcdc75b700343f978a9524e58 (patch) | |
| tree | ef186be8a9211da3a00373d76a2da79379909999 /activerecord/lib/active_record/associations/association_proxy.rb | |
| parent | 762295e0ae9d67450403596412bb8489893378d9 (diff) | |
| download | rails-a34cc42a2c29928bcdc75b700343f978a9524e58.tar.gz rails-a34cc42a2c29928bcdc75b700343f978a9524e58.tar.bz2 rails-a34cc42a2c29928bcdc75b700343f978a9524e58.zip | |
- Updated tzinfo to use Rational() instead of Rational.new! due to "private method new!" in Ruby 1.9 - Added ^object_id$ as ignore pattern to fixing "redefining object_id" issue in Ruby 1.9
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord/lib/active_record/associations/association_proxy.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_proxy.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb index 68503a3c40..ec16af3897 100644 --- a/activerecord/lib/active_record/associations/association_proxy.rb +++ b/activerecord/lib/active_record/associations/association_proxy.rb @@ -49,7 +49,7 @@ module ActiveRecord alias_method :proxy_respond_to?, :respond_to? alias_method :proxy_extend, :extend delegate :to_param, :to => :proxy_target - instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_)/ } + instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ } def initialize(owner, reflection) @owner, @reflection = owner, reflection |