From e35d4a7d85c125b3078587a1f93de3b845ec3365 Mon Sep 17 00:00:00 2001
From: "Sebastian G. Marinescu" <sebastian.marinescu@gmail.com>
Date: Tue, 17 Jul 2018 15:55:31 -0400
Subject: [PATCH] closes #6283

---
 src/meta/tags.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/meta/tags.js b/src/meta/tags.js
index 09019884c3..fe95bab6cf 100644
--- a/src/meta/tags.js
+++ b/src/meta/tags.js
@@ -56,7 +56,7 @@ Tags.parse = function (req, data, meta, link, callback) {
 			var defaultLinks = [{
 				rel: 'icon',
 				type: 'image/x-icon',
-				href: nconf.get('relative_path') + '/favicon.ico' + (Meta.config['cache-buster'] ? '?' + Meta.config['cache-buster'] : ''),
+				href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/favicon.ico' + (Meta.config['cache-buster'] ? '?' + Meta.config['cache-buster'] : ''),
 			}, {
 				rel: 'manifest',
 				href: nconf.get('relative_path') + '/manifest.json',
@@ -75,31 +75,31 @@ Tags.parse = function (req, data, meta, link, callback) {
 			if (Meta.config['brand:touchIcon']) {
 				defaultLinks.push({
 					rel: 'apple-touch-icon',
-					href: nconf.get('relative_path') + '/apple-touch-icon',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-orig.png',
 				}, {
 					rel: 'icon',
 					sizes: '36x36',
-					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-36.png',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-36.png',
 				}, {
 					rel: 'icon',
 					sizes: '48x48',
-					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-48.png',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-48.png',
 				}, {
 					rel: 'icon',
 					sizes: '72x72',
-					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-72.png',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-72.png',
 				}, {
 					rel: 'icon',
 					sizes: '96x96',
-					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-96.png',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-96.png',
 				}, {
 					rel: 'icon',
 					sizes: '144x144',
-					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-144.png',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-144.png',
 				}, {
 					rel: 'icon',
 					sizes: '192x192',
-					href: nconf.get('relative_path') + '/assets/uploads/system/touchicon-192.png',
+					href: nconf.get('relative_path') + nconf.get('upload_url') + '/system/touchicon-192.png',
 				});
 			}
 			plugins.fireHook('filter:meta.getLinkTags', { req: req, data: data, links: defaultLinks }, next);