Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 06:07:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5475 from NodeBB/favicon-fix

Browse Source 
Fixes #5474
This commit is contained in:
Julian Lam
2017-02-23 17:11:11 -05:00
committed by GitHub
parent 4163ce0218 8b533bb431
commit cfc8884c9c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/webserver.js
View File

@@ -159,7 +159,8 @@ function setupExpressApp(app) {
}
function setupFavicon(app) {
var faviconPath = path.join(nconf.get('base_dir'), 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
var faviconPath = meta.config['brand:favicon'] || 'favicon.ico';
faviconPath = path.join(nconf.get('base_dir'), 'public', faviconPath.replace(/assets\/uploads/, 'uploads'));
if (file.existsSync(faviconPath)) {
app.use(nconf.get('relative_path'), favicon(faviconPath));
}