Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-01-26 19:26:48 -05:00
parent c7506d77b0
commit 18ba08183c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/middleware/index.js
View File

@@ -99,13 +99,14 @@ middleware.routeTouchIcon = function (req, res) {
if (meta.config['brand:touchIcon'] && validator.isURL(meta.config['brand:touchIcon'])) { if (meta.config['brand:touchIcon'] && validator.isURL(meta.config['brand:touchIcon'])) {
return res.redirect(meta.config['brand:touchIcon']); return res.redirect(meta.config['brand:touchIcon']);
} }
var iconPath = '../../public'; var iconPath = '';
if (meta.config['brand:touchIcon']) { if (meta.config['brand:touchIcon']) {
iconPath += meta.config['brand:touchIcon'].replace(/assets\/uploads/, 'uploads'); iconPath = path.join(nconf.get('upload_path'), meta.config['brand:touchIcon'].replace(/assets\/uploads/, ''));
} else { } else {
iconPath += '/logo.png'; iconPath = path.join(nconf.get('base_dir'), 'public/logo.png');
} }
return res.sendFile(path.join(__dirname, iconPath), {
return res.sendFile(iconPath, {
maxAge: req.app.enabled('cache') ? 5184000000 : 0, maxAge: req.app.enabled('cache') ? 5184000000 : 0,
}); });
}; };