From 610d687a96fef5a3c59bad069bea7bd09aa395b6 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 21 Apr 2015 14:32:36 -0400
Subject: [PATCH] moved favicon into default link tags, and fixed bug that
 caused link tags to not show up

---
 src/meta/tags.js             | 9 ++++-----
 src/middleware/middleware.js | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/meta/tags.js b/src/meta/tags.js
index 165851820b..022a3ef778 100644
--- a/src/meta/tags.js
+++ b/src/meta/tags.js
@@ -31,6 +31,10 @@ module.exports = function(Meta) {
 				content: Meta.config['brand:logo'] || ''
 			}]),
 			async.apply(plugins.fireHook, 'filter:meta.getLinkTags', [{
+				rel: "icon",
+				type: "image/x-icon",
+				href: nconf.get('relative_path') + '/favicon.ico'
+			}, {
 				rel: 'apple-touch-icon',
 				href: nconf.get('relative_path') + '/apple-touch-icon'
 			}])
@@ -46,11 +50,6 @@ module.exports = function(Meta) {
 			});
 
 			link = tags[1].concat(link || []);
-			link.unshift({
-				rel: "icon",
-				type: "image/x-icon",
-				href: nconf.get('relative_path') + '/favicon.ico'
-			});
 
 			callback(null, {
 				meta: meta,
diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index 7ef23b28b0..9e400de9b7 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -270,7 +270,7 @@ middleware.renderHeader = function(req, res, callback) {
 		templateValues.browserTitle = results.title;
 		templateValues.navigation = results.navigation
 		templateValues.metaTags = results.tags.meta;
-		templateValues.metalinkTags = results.tags.link;
+		templateValues.linkTags = results.tags.link;
 		templateValues.isAdmin = results.user.isAdmin;
 		templateValues.user = results.user;
 		templateValues.userJSON = JSON.stringify(results.user);