Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-21 16:00:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts, minify only .js files

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-02-23 18:31:49 -07:00
parent ee9d7584e4 cfc8884c9c
commit dd2b930824
99 changed files with 4500 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/webserver.js
View File

@@ -103,9 +103,9 @@ function initializeNodeBB(callback) {
},
function (next) {
async.series([
async.apply(meta.sounds.init),
async.apply(languages.init),
async.apply(meta.blacklist.load),
meta.sounds.addUploads,
languages.init,
meta.blacklist.load,
], next);
},
], callback);
@@ -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));
}