From 18ba08183c2acf1b62e40db24f3ee8153f08cf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 26 Jan 2018 19:26:48 -0500 Subject: [PATCH] fix test --- src/middleware/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/middleware/index.js b/src/middleware/index.js index cb91f82339..c0cce7623a 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -99,13 +99,14 @@ middleware.routeTouchIcon = function (req, res) { if (meta.config['brand:touchIcon'] && validator.isURL(meta.config['brand:touchIcon'])) { return res.redirect(meta.config['brand:touchIcon']); } - var iconPath = '../../public'; + var iconPath = ''; 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 { - 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, }); };