From bc7fd3a72444265c9a33ec20348409857d63dd5e Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Mon, 10 Feb 2014 22:24:36 -0500 Subject: [PATCH] fix for favicon --- src/webserver.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/webserver.js b/src/webserver.js index 45dd4c00f4..6c0c7080c9 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -129,7 +129,7 @@ module.exports.server = server; templateValues.linkTags.push({ rel: "icon", type: "image/x-icon", - href: meta.config['brand:favicon'] || nconf.get('relative_path') + '/favicon.ico' + href: nconf.get('relative_path') + '/favicon.ico' }); // Browser Title @@ -192,7 +192,9 @@ module.exports.server = server; logger.init(app); - app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico'))); + + app.use(express.favicon(path.join(__dirname, '../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico'))); + app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public'), prefix: nconf.get('relative_path'),