Commit bf90848a authored by Eric Davis's avatar Eric Davis

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

parents cff4e830 c2d058a5
......@@ -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
@updated_on = time
@updated_on = content && content.updated_on
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment