IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 20:24:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: use default favicon if a bad favicon is specified

Browse Source
This commit is contained in:
Sam Saffron 2015-12-22 18:08:27 +11:00
parent c87fff670d
commit 00342faff9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/static_controller.rb
View File

@ -106,7 +106,9 @@ class StaticController < ApplicationController
end
if data.bytesize == 0
render text: UserAvatarsController::DOT, content_type: "image/gif"
@@default_favicon ||= File.read(Rails.root + "public/images/default-favicon.png")
response.headers["Content-Length"] = @@default_favicon.bytesize.to_s
render text: @@default_favicon, content_type: "image/png"
else
expires_in 1.year, public: true
response.headers["Expires"] = 1.year.from_now.httpdate