From 63b399c9b22b7f2a8dfc14fe68bc6579fccb3bf9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 4 Sep 2009 08:45:38 +0000 Subject: [PATCH] Update to rails 2.3.4 for security fixes. --- app/models/user.rb | 2 +- config/environment.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index ae5b0b74f..9d7d233b7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -33,7 +33,7 @@ class User < ActiveRecord::Base 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 diff --git a/config/environment.rb b/config/environment.rb index e35353c3c..12a8b5424 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -5,7 +5,7 @@ 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' -- 2.43.2