From 581ff6749993c867d4e5279eb80eec5e719adfce Mon Sep 17 00:00:00 2001
From: Aileen Nowak <aileen@ghost.org>
Date: Wed, 5 Apr 2017 21:28:52 +0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20correct=20favicon=20redirects?=
 =?UTF-8?q?=20with=20subdirectory=20(#8274)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs #7688, #8221

Use our url util `urlFor` to ensure, the redirect includes the subdirectory, if set up.
---
 core/server/middleware/serve-favicon.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/server/middleware/serve-favicon.js b/core/server/middleware/serve-favicon.js
index 9e48d524ba2..938bba551b1 100644
--- a/core/server/middleware/serve-favicon.js
+++ b/core/server/middleware/serve-favicon.js
@@ -45,7 +45,7 @@ function serveFavicon() {
             if (settingsCache.get('icon')) {
                 // depends on the uploaded icon extension
                 if (originalExtension !== requestedExtension) {
-                    return res.redirect(302, '/favicon' + originalExtension);
+                    return res.redirect(302, utils.url.urlFor({relativeUrl: '/favicon' + originalExtension}));
                 }
 
                 storage.getStorage()
@@ -66,7 +66,7 @@ function serveFavicon() {
 
                 // CASE: always redirect to .ico for default icon
                 if (originalExtension !== requestedExtension) {
-                    return res.redirect(302, '/favicon.ico');
+                    return res.redirect(302, utils.url.urlFor({relativeUrl: '/favicon.ico'}));
                 }
 
                 fs.readFile(filePath, function readFile(err, buf) {