From 1f6764e2af6119652865ce5a913f924159b2a101 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 1 Jan 2012 17:58:14 +0000
Subject: [PATCH] Rails3 compat.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8459 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/wiki_page.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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
-- 
2.39.5