lib/simple_model/attributes.rb in simple_model-1.2.13 vs lib/simple_model/attributes.rb in simple_model-1.2.15

@@ -277,10 +277,10 @@
       # Must inherit super's defined_attributes and alias_attributes
       # Rails 3.0 does some weird stuff with ActiveModel::Dirty so we need a
       # hack to keep things working when a class inherits from a super that
       # has ActiveModel::Dirty included
       def inherited(base)
-        base.alias_attributes = base.alias_attributes.merge(self.alias_attributes)
+        base.alias_attributes = self.alias_attributes.merge(base.alias_attributes)
         super
         # Rails 3.0 Hack
         if (ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR == 0)
           base.attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
           base.attribute_method_affix :prefix => 'reset_', :suffix => '!'