]> git.openstreetmap.org Git - rails.git/commitdiff
Update to rails 2.3.4 for security fixes.
authorTom Hughes <tom@compton.nu>
Fri, 4 Sep 2009 08:45:38 +0000 (08:45 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 4 Sep 2009 08:45:38 +0000 (08:45 +0000)
app/models/user.rb
config/environment.rb

index ae5b0b74f708b5b94ba5fc09242762b904c36955..9d7d233b7276f612eb420f56e4991e741e6c3aee 100644 (file)
@@ -33,7 +33,7 @@ class User < ActiveRecord::Base
   file_column :image, :magick => { :geometry => "100x100>" }
 
   def after_initialize
   file_column :image, :magick => { :geometry => "100x100>" }
 
   def after_initialize
-    self.creation_time = Time.now.getutc if self.creation_time.nil?
+    self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
   end
 
   def encrypt_password
   end
 
   def encrypt_password
index e35353c3cd6b851ebecad7515d8000fd6a0f1f27..12a8b542404319b3e56a6da7ba62f9e164d947bf 100644 (file)
@@ -5,7 +5,7 @@
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'