From bc10080c4954c0a0c6418fa08aff10018a6b5e0a Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 19 Feb 2014 21:47:26 -0500
Subject: [PATCH] close #1041
---
src/webserver.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/webserver.js b/src/webserver.js
index 687280bf14..f8cd31fe83 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -88,10 +88,10 @@ module.exports.server = server;
property: 'keywords',
content: meta.config.keywords || ''
}],
- defaultLinkTags = [/*{
+ defaultLinkTags = [{
rel: 'apple-touch-icon',
- href: meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'
- }*/],
+ href: '/apple-touch-icon'
+ }],
templateValues = {
bootswatchCSS: meta.config['theme:src'],
pluginCSS: plugins.cssFiles.map(function(file) { return { path: nconf.get('relative_path') + file.replace(/\\/g, '/') }; }),
@@ -203,7 +203,13 @@ module.exports.server = server;
logger.init(app);
+ // favicon & apple-touch-icon middleware
app.use(express.favicon(path.join(__dirname, '../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico')));
+ app.use('/apple-touch-icon', function(req, res) {
+ return res.sendfile(path.join(__dirname, '../public', meta.config['brand:logo'] || nconf.get('relative_path') + '/logo.png'), {
+ maxAge: app.enabled('cache') ? 5184000000 : 0
+ });
+ });
app.use(require('less-middleware')({
src: path.join(__dirname, '../', 'public'),