diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-26 19:35:25 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-05-26 19:35:25 +0000 |
| commit | 9aef7a32425ddfc082a5d618c4f6b7f70412c85f (patch) | |
| tree | 1ff7e9409883be7652a8cc1a6c287275b50f79e9 /app/models/wiki_page.rb | |
| parent | 189be55235b75c32908a4037825b453513673e64 (diff) | |
| download | redmine-9aef7a32425ddfc082a5d618c4f6b7f70412c85f.tar.gz redmine-9aef7a32425ddfc082a5d618c4f6b7f70412c85f.zip | |
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
Diffstat (limited to 'app/models/wiki_page.rb')
| -rw-r--r-- | app/models/wiki_page.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |