From 042575a0dcc79a1ae96fe4f815ee6c61292b4afe Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <erisds@gmail.com>
Date: Mon, 6 Nov 2017 12:57:24 +0000
Subject: [PATCH] Moved set context call into renderer

---
 core/server/apps/amp/lib/router.js                 | 4 ----
 core/server/apps/private-blogging/lib/router.js    | 4 ----
 core/server/apps/subscribers/lib/router.js         | 4 ----
 core/server/controllers/frontend/render-channel.js | 6 +-----
 core/server/controllers/frontend/render-entry.js   | 6 +-----
 core/server/controllers/frontend/renderer.js       | 4 ++++
 6 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/core/server/apps/amp/lib/router.js b/core/server/apps/amp/lib/router.js
index f304b83bf6f4..29e1d55de4bc 100644
--- a/core/server/apps/amp/lib/router.js
+++ b/core/server/apps/amp/lib/router.js
@@ -6,7 +6,6 @@ var path                = require('path'),
     // Dirty requires
     errors              = require('../../../errors'),
     postLookup          = require('../../../controllers/frontend/post-lookup'),
-    setResponseContext  = require('../../../controllers/frontend/context'),
     renderer            = require('../../../controllers/frontend/renderer'),
 
     templateName = 'amp';
@@ -29,9 +28,6 @@ function _renderer(req, res, next) {
         return next(new errors.NotFoundError({message: i18n.t('errors.errors.pageNotFound')}));
     }
 
-    // Context
-    setResponseContext(req, res, data);
-
     // Render Call
     return renderer(req, res, data);
 }
diff --git a/core/server/apps/private-blogging/lib/router.js b/core/server/apps/private-blogging/lib/router.js
index ee2aa7c557bb..a5fb97500d4d 100644
--- a/core/server/apps/private-blogging/lib/router.js
+++ b/core/server/apps/private-blogging/lib/router.js
@@ -2,7 +2,6 @@ var path                = require('path'),
     express             = require('express'),
     middleware          = require('./middleware'),
     bodyParser          = require('body-parser'),
-    setResponseContext  = require('../../../controllers/frontend/context'),
     renderer            = require('../../../controllers/frontend/renderer'),
     brute               = require('../../../middleware/brute'),
 
@@ -27,9 +26,6 @@ function _renderer(req, res) {
         data.error = res.error;
     }
 
-    // Context
-    setResponseContext(req, res);
-
     // Render Call
     return renderer(req, res, data);
 }
diff --git a/core/server/apps/subscribers/lib/router.js b/core/server/apps/subscribers/lib/router.js
index 8c32de526f48..1cfc552285d0 100644
--- a/core/server/apps/subscribers/lib/router.js
+++ b/core/server/apps/subscribers/lib/router.js
@@ -9,7 +9,6 @@ var path                = require('path'),
     errors              = require('../../../errors'),
     validator           = require('../../../data/validation').validator,
     postLookup          = require('../../../controllers/frontend/post-lookup'),
-    setResponseContext  = require('../../../controllers/frontend/context'),
     renderer            = require('../../../controllers/frontend/renderer'),
 
     templateName = 'subscribe';
@@ -27,9 +26,6 @@ function _renderer(req, res) {
     // Format data
     var data = req.body;
 
-    // Context
-    setResponseContext(req, res);
-
     // Render Call
     return renderer(req, res, data);
 }
diff --git a/core/server/controllers/frontend/render-channel.js b/core/server/controllers/frontend/render-channel.js
index 00d26b695824..f367d94031e4 100644
--- a/core/server/controllers/frontend/render-channel.js
+++ b/core/server/controllers/frontend/render-channel.js
@@ -1,7 +1,6 @@
 var debug = require('ghost-ignition').debug('channels:render'),
     formatResponse = require('./format-response'),
-    renderer = require('./renderer'),
-    setResponseContext = require('./context');
+    renderer = require('./renderer');
 
 module.exports = function renderChannel(req, res) {
     debug('renderChannel called');
@@ -11,9 +10,6 @@ module.exports = function renderChannel(req, res) {
         // Do final data formatting and then render
         var data = formatResponse.channel(result);
 
-        // Context
-        setResponseContext(req, res);
-
         // Render Call
         return renderer(req, res, data);
     };
diff --git a/core/server/controllers/frontend/render-entry.js b/core/server/controllers/frontend/render-entry.js
index ed1033b0de80..d25041afaacd 100644
--- a/core/server/controllers/frontend/render-entry.js
+++ b/core/server/controllers/frontend/render-entry.js
@@ -1,7 +1,6 @@
 var debug = require('ghost-ignition').debug('channels:render-post'),
     formatResponse = require('./format-response'),
-    renderer = require('./renderer'),
-    setResponseContext = require('./context');
+    renderer = require('./renderer');
 /*
  * Sets the response context around an entry (post or page)
  * and renders it with the correct template.
@@ -15,9 +14,6 @@ module.exports = function renderEntry(req, res) {
         // Format data 2 - 1 is in preview/entry
         var data = formatResponse.entry(entry);
 
-        // Context
-        setResponseContext(req, res, data);
-
         // Render Call
         return renderer(req, res, data);
     };
diff --git a/core/server/controllers/frontend/renderer.js b/core/server/controllers/frontend/renderer.js
index 46e58c1687b9..4204f9be0dff 100644
--- a/core/server/controllers/frontend/renderer.js
+++ b/core/server/controllers/frontend/renderer.js
@@ -1,7 +1,11 @@
 var debug = require('ghost-ignition').debug('renderer'),
+    setContext = require('./context'),
     templates = require('./templates');
 
 module.exports = function renderer(req, res, data) {
+    // Context
+    setContext(req, res, data);
+
     // Template
     templates.setTemplate(req, res, data);