github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 23:24:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: StaticController#favicon reads from disk when using local store. (#7160)

Browse Source 
Since uploads site settings are now backed by an actual upload, we don't
have to reach over the network just to fetch the favicon. Instead, we
can just read the upload directly from disk.
This commit is contained in:
Guo Xiang Tan
2019-03-14 04:17:36 +08:00
committed by GitHub
parent 4f74210949
commit 1c6a2262b3
3 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse.js.es6
View File

@ -62,10 +62,7 @@ const Discourse = Ember.Application.extend({
@observes("notifyCount")
faviconChanged() {
if (Discourse.User.currentProp("dynamic_favicon")) {
let url = Discourse.SiteSettings.site_favicon_url;
if (/^http/.test(url)) {
url = Discourse.getURL("/favicon/proxied?" + encodeURIComponent(url));
}
const url = Discourse.getURL("/favicon/proxied");
new window.Favcount(url).set(this.get("notifyCount"));
}
},