From ecd777b659d0746f896912aa3c9c18cf2aa88639 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 23 Nov 2015 10:57:36 -0500
Subject: [PATCH] closes
 https://github.com/NodeBB/nodebb-theme-persona/issues/206

---
 public/src/variables.js  | 2 +-
 src/middleware/render.js | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/src/variables.js b/public/src/variables.js
index 9f303852c3..056c616555 100644
--- a/public/src/variables.js
+++ b/public/src/variables.js
@@ -6,7 +6,7 @@
 	ajaxify.variables = {};
 
 	ajaxify.variables.parse = function() {
-		var dataEl = $('#content #ajaxify-data');
+		var dataEl = $('#ajaxify-data');
 		if (dataEl.length) {
 			ajaxify.data = JSON.parse(dataEl.text());
 		}
diff --git a/src/middleware/render.js b/src/middleware/render.js
index b2bc9c0bd2..559692f800 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -47,16 +47,13 @@ module.exports = function(middleware) {
 			}
 
 			var ajaxifyData = JSON.stringify(options);
+			ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
 
 			render.call(self, template, options, function(err, str) {
 				if (err) {
 					return fn(err);
 				}
 
-				ajaxifyData = ajaxifyData.replace(/<\//g, '<\\/');
-
-				str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
-
 				str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : '');
 
 				if (res.locals.footer) {
@@ -75,10 +72,12 @@ module.exports = function(middleware) {
 						var language = res.locals.config ? res.locals.config.userLang || 'en_GB' : 'en_GB';
 						language = req.query.lang || language;
 						translator.translate(str, language, function(translated) {
+							translated = translated + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
 							fn(err, translated);
 						});
 					});
 				} else {
+					str = str + '<script id="ajaxify-data" type="application/json">' + ajaxifyData + '</script>';
 					fn(err, str);
 				}
 			});