##// END OF EJS Templates
Fixed test failures on wiki_page updated_on eager loading (#10996)....
Jean-Philippe Lang -
r9544:9aef7a32425d
parent child
Show More
@@ -143,7 +143,7 class WikiPage < ActiveRecord::Base
143 if time = read_attribute(:updated_on)
143 if time = read_attribute(:updated_on)
144 # content updated_on was eager loaded with the page
144 # content updated_on was eager loaded with the page
145 begin
145 begin
146 @updated_on = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s)
146 @updated_on = (self.class.default_timezone == :utc ? Time.parse(time.to_s).utc : Time.parse(time.to_s).localtime)
147 rescue
147 rescue
148 end
148 end
149 else
149 else
General Comments 0
You need to be logged in to leave comments. Login now