Merge branch 'master' of https://github.com/rails/rails

1 files changed, 8 insertions, 4 deletions

diff --git a/activerecord/test/models/subject.rb b/activerecord/test/models/subject.rb
index 1b9d8107f8..8e28f8b86b 100644
--- a/activerecord/test/models/subject.rb
+++ b/activerecord/test/models/subject.rb
@@ -1,12 +1,16 @@
 # used for OracleSynonymTest, see test/synonym_test_oracle.rb
 #
 class Subject < ActiveRecord::Base
+
+  # added initialization of author_email_address in the same way as in Topic class
+  # as otherwise synonym test was failing
+  after_initialize :set_email_address
+
   protected
-    # added initialization of author_email_address in the same way as in Topic class
-    # as otherwise synonym test was failing
-    def after_initialize
-      if self.new_record?
+    def set_email_address
+      unless self.persisted?
         self.author_email_address = 'test@test.com'
       end
     end
+
 end