<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,7 @@
 *Edge*
 
+* Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved] [miloops]
+
 * Added find_last_by dynamic finder #762 [miloops]
 
 * Internal API: configurable association options and build_association method for reflections so plugins may extend and override.  #985 [Hongli Lai]</diff>
      <filename>activerecord/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -10,7 +10,7 @@ module ActiveRecord
       base.attribute_types_cached_by_default = ATTRIBUTE_TYPES_CACHED_BY_DEFAULT
       base.cattr_accessor :time_zone_aware_attributes, :instance_writer =&gt; false
       base.time_zone_aware_attributes = false
-      base.cattr_accessor :skip_time_zone_conversion_for_attributes, :instance_writer =&gt; false
+      base.class_inheritable_accessor :skip_time_zone_conversion_for_attributes, :instance_writer =&gt; false
       base.skip_time_zone_conversion_for_attributes = []
     end
 </diff>
      <filename>activerecord/lib/active_record/attribute_methods.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,6 @@
 require &quot;cases/helper&quot;
 require 'models/topic'
+require 'models/minimalistic'
 
 class AttributeMethodsTest &lt; ActiveRecord::TestCase
   fixtures :topics
@@ -219,6 +220,14 @@ class AttributeMethodsTest &lt; ActiveRecord::TestCase
     end
   end
 
+  def test_setting_time_zone_conversion_for_attributes_should_write_value_on_class_variable
+    Topic.skip_time_zone_conversion_for_attributes = [:field_a]
+    Minimalistic.skip_time_zone_conversion_for_attributes = [:field_b]
+    
+    assert_equal [:field_a], Topic.skip_time_zone_conversion_for_attributes 
+    assert_equal [:field_b], Minimalistic.skip_time_zone_conversion_for_attributes 
+  end
+
   private
   def time_related_columns_on_topic
     Topic.columns.select{|c| [:time, :date, :datetime, :timestamp].include?(c.type)}.map(&amp;:name)</diff>
      <filename>activerecord/test/cases/attribute_methods_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d28c724b4074605445d2834888ad280778f0af6a</id>
    </parent>
  </parents>
  <author>
    <name>miloops</name>
    <email>miloops@gmail.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/9c4730d01e892df8d5c5493a08e0cddf0de5d575</url>
  <id>9c4730d01e892df8d5c5493a08e0cddf0de5d575</id>
  <committed-date>2008-09-14T15:18:17-07:00</committed-date>
  <authored-date>2008-09-12T07:28:47-07:00</authored-date>
  <message>Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved]</message>
  <tree>197f3ba0d291def506aa2dc85ba1caff88d31c32</tree>
  <committer>
    <name>gbuesing</name>
    <email>gbuesing@gmail.com</email>
  </committer>
</commit>
