🐛 correct favicon redirects with subdirectory (#8274)

refs #7688, #8221 Use our url util `urlFor` to ensure, the redirect includes the subdirectory, if set up.
TryGhost · Apr 5, 2017 · 581ff67 · 581ff67
1 parent 817b8d0
commit 581ff67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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) {