From 9aef7a32425ddfc082a5d618c4f6b7f70412c85f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 26 May 2012 19:35:25 +0000 Subject: Fixed test failures on wiki_page updated_on eager loading (#10996). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9727 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/wiki_page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index a216a014f..2f7803f2a 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -143,7 +143,7 @@ class WikiPage < ActiveRecord::Base if time = read_attribute(:updated_on) # content updated_on was eager loaded with the page begin - @updated_on = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s) + @updated_on = (self.class.default_timezone == :utc ? Time.parse(time.to_s).utc : Time.parse(time.to_s).localtime) rescue end else -- cgit v1.2.3