Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: compare Time with nil error in dev env. Remove nils when looking for max mtime.

This commit is contained in:
Neil Lalonde 2014-05-22 18:46:22 -04:00
parent 67db561429
commit d412cd370e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sass/discourse_stylesheets.rb
View File

@ -83,7 +83,7 @@ class DiscourseStylesheets
0 0
else else
[ Dir.glob("#{Rails.root}/app/assets/stylesheets/**/*.*css").map {|x| File.mtime(x) }.max, [ Dir.glob("#{Rails.root}/app/assets/stylesheets/**/*.*css").map {|x| File.mtime(x) }.max,
Dir.glob("#{Rails.root}/plugins/**/assets/stylesheets/**/*.*css").map {|x| File.mtime(x) }.max ].max.to_i Dir.glob("#{Rails.root}/plugins/**/assets/stylesheets/**/*.*css").map {|x| File.mtime(x) }.max ].compact.max.to_i
end end
theme = (cs = ColorScheme.enabled) ? "#{cs.id}-#{cs.version}" : 0 theme = (cs = ColorScheme.enabled) ? "#{cs.id}-#{cs.version}" : 0