diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/callbacks.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index ba7151ccbb..6771e3e9c9 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -4,7 +4,7 @@ * Speed up ActiveRecord#method_missing for the common case (read_attribute). -* Only notify observers on after_find and after_initialize if these methods are defined on the model. [skaes@web.de] +* Only notify observers on after_find and after_initialize if these methods are defined on the model. #1235 [skaes@web.de] * Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath] diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb index 629272b639..8e3aac6e36 100755 --- a/activerecord/lib/active_record/callbacks.rb +++ b/activerecord/lib/active_record/callbacks.rb @@ -221,7 +221,7 @@ module ActiveRecord if object.respond_to_without_attributes?(:after_initialize) object.send(:callback, :after_initialize) end - + object end end @@ -344,9 +344,9 @@ module ActiveRecord end return false if result == false end - + send(method) if respond_to_without_attributes?(method) - + return true end |