aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/attribute_methods.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index b41c7ffdab..ef510a1a2c 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -146,8 +146,6 @@ module ActiveRecord
else
super
end
- elsif @attributes.include?(method_name)
- read_attribute(method_name)
else
super
end
@@ -172,11 +170,7 @@ module ActiveRecord
end
end
- if @attributes.nil?
- return super
- elsif @attributes.include?(method_name)
- return true
- elsif md = self.class.match_attribute_method?(method_name)
+ if md = self.class.match_attribute_method?(method_name)
return true if @attributes.include?(md.pre_match)
end
super