kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Davis 2011-05-13 09:29:48 -07:00
commit bf90848ae8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/wiki_page.rb
View File

@ -131,7 +131,10 @@ class WikiPage < ActiveRecord::Base
unless @updated_on unless @updated_on
if time = read_attribute(:updated_on) if time = read_attribute(:updated_on)
# content updated_on was eager loaded with the page # 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 else
@updated_on = content && content.updated_on @updated_on = content && content.updated_on
end end