instance_environment.rb in radiant-0.8.1

- old
+ new

@@ -27,26 +27,26 @@
     :session_key => '_<%= app_name %>_session',
     :secret      => <% require 'digest/sha1' %>'<%= Digest::SHA1.hexdigest("--#{app_name}--#{Time.now.to_s}--#{rand(10000000)}--") %>'
   }
 
   # Comment out this line if you want to turn off all caching, or
-  # add options to modify the behavior. In the majority of deployment 
+  # add options to modify the behavior. In the majority of deployment
   # scenarios it is desirable to leave Radiant's cache enabled and in
   # the default configuration.
   #
   # Additional options:
   #  :use_x_sendfile => true
   #    Turns on X-Sendfile support for Apache with mod_xsendfile or lighttpd.
   #  :use_x_accel_redirect => '/some/virtual/path'
   #    Turns on X-Accel-Redirect support for nginx. You have to provide
-  #    a path that corresponds to a virtual location in your webserver 
+  #    a path that corresponds to a virtual location in your webserver
   #    configuration.
-  #  :entitystore => "radiant:cache/entity"
-  #    Sets the entity store type (preceding the colon) and storage 
+  #  :entitystore => "radiant:tmp/cache/entity"
+  #    Sets the entity store type (preceding the colon) and storage
   #   location (following the colon, relative to Rails.root).
   #    We recommend you use radiant: since this will enable manual expiration.
-  #  :metastore => "radiant:cache/meta"
+  #  :metastore => "radiant:tmp/cache/meta"
   #    Sets the meta store type and storage location.  We recommend you use
   #    radiant: since this will enable manual expiration and acceleration headers.
   config.middleware.use ::Radiant::Cache
 
   # Use the database for sessions instead of the cookie-based default,
@@ -56,10 +56,10 @@
 
   # Activate observers that should always be running
   config.active_record.observers = :user_action_observer
 
   # Make Active Record use UTC-base instead of local time
-  config.active_record.default_timezone = :utc
+  config.time_zone = 'UTC'
 
   # Set the default field error proc
   config.action_view.field_error_proc = Proc.new do |html, instance|
     if html !~ /label/
       %{<div class="error-with-field">#{html} <small class="error">&bull; #{[instance.error_message].flatten.first}</small></div>}
\ No newline at end of file