Merge remote-tracking branch 'schmidt/b/390-mysql2-incompat-in-wiki-page' into unstable

2011-05-13 09:29:48 -07:00 · 2011-05-13 09:29:48 -07:00 · bf90848ae8
parent cff4e83044 c2d058a53b
commit bf90848ae8
1 changed files with 4 additions and 1 deletions
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@ -131,7 +131,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
+        unless time.is_a? Time
+          time = Time.parse(time) rescue nil
+        end
+        @updated_on = time
      else
        @updated_on = content && content.updated_on
      end