diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-01 17:58:14 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-01 17:58:14 +0000 |
| commit | 1f6764e2af6119652865ce5a913f924159b2a101 (patch) | |
| tree | 67c175ae6658ef34c7d8711fd3e8a029c7825894 /app/models/wiki_page.rb | |
| parent | cd256fe89f8432b6e1edd20bd389b7695087724d (diff) | |
| download | redmine-1f6764e2af6119652865ce5a913f924159b2a101.tar.gz redmine-1f6764e2af6119652865ce5a913f924159b2a101.zip | |
Rails3 compat.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8459 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/wiki_page.rb')
| -rw-r--r-- | app/models/wiki_page.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index c6e5f21ed..5508bd218 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -137,7 +137,10 @@ class WikiPage < ActiveRecord::Base unless @updated_on if time = read_attribute(:updated_on) # content updated_on was eager loaded with the page - @updated_on = Time.parse(time) rescue nil + begin + @updated_on = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s) + rescue + end else @updated_on = content && content.updated_on end |