From 635032fe3ba3d189e9c62eadb6e604f22669414d Mon Sep 17 00:00:00 2001 From: kennyj Date: Mon, 4 Jun 2012 03:12:21 +0900 Subject: [PATCH] Fix #6591. If a field with timezone isn't changed, we don't call will_change!. --- .../active_record/attribute_methods/time_zone_conversion.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index ac31b636db900..58a5d82e14c27 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -57,8 +57,9 @@ def #{attr_name}=(original_time) time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time end time = time.in_time_zone rescue nil if time + changed = read_attribute(:#{attr_name}) != time write_attribute(:#{attr_name}, original_time) - #{attr_name}_will_change! + #{attr_name}_will_change! if changed @attributes_cache["#{attr_name}"] = time end EOV