From 0eca875f6ea2f3d5849bcd66f9c5eb036ae5ea12 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 27 Aug 2015 16:30:43 -0400
Subject: [PATCH 1/3] add site title to 404, on cold load anyways

---
 src/controllers/helpers.js | 12 ++++++++++--
 src/routes/index.js        |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 6a35540088..001c30c611 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -19,9 +19,17 @@ helpers.notFound = function(req, res, error) {
 			error: error
 		});
 	} else if (res.locals.isAPI) {
-		res.status(404).json({path: req.path.replace(/^\/api/, ''), error: error});
+		res.status(404).json({
+			path: req.path.replace(/^\/api/, ''),
+			error: error,
+			title: '[[global:404.title]]'
+		});
 	} else {
-		res.status(404).render('404', {path: req.path, error: error});
+		res.status(404).render('404', {
+			path: req.path,
+			error: error,
+			title: '[[global:404.title]]'
+		});
 	}
 };
 
diff --git a/src/routes/index.js b/src/routes/index.js
index 823cd45f8a..4d95ccb25f 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -193,7 +193,7 @@ function handle404(app, middleware) {
 			}
 
 			middleware.buildHeader(req, res, function() {
-				res.render('404', {path: req.path});
+				res.render('404', {path: req.path, title: '[[global:404.title]]'});
 			});
 		} else {
 			res.status(404).type('txt').send('Not found');

From dbc9c07b5591bba67f5e8d1aee787ae3ff0ea9bd Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 27 Aug 2015 16:34:01 -0400
Subject: [PATCH 2/3] 403 browser title

---
 src/controllers/helpers.js   | 12 ++++++++++--
 src/middleware/middleware.js |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 001c30c611..ffc20fb90a 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -36,9 +36,17 @@ helpers.notFound = function(req, res, error) {
 helpers.notAllowed = function(req, res, error) {
 	if (req.uid) {
 		if (res.locals.isAPI) {
-			res.status(403).json({path: req.path.replace(/^\/api/, ''), loggedIn: !!req.uid, error: error});
+			res.status(403).json({
+				path: req.path.replace(/^\/api/, ''),
+				loggedIn: !!req.uid, error: error,
+				title: '[[global:403.title]]'
+			});
 		} else {
-			res.status(403).render('403', {path: req.path, loggedIn: !!req.uid, error: error});
+			res.status(403).render('403', {
+				path: req.path,
+				loggedIn: !!req.uid, error: error,
+				title: '[[global:403.title]]'
+			});
 		}
 	} else {
 		if (res.locals.isAPI) {
diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index 1e787c1def..a94fd55038 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -519,7 +519,7 @@ middleware.requireUser = function(req, res, next) {
 		return next();
 	}
 
-	res.render('403', {});
+	res.render('403', {title: '[[global:403.title]]'});
 };
 
 function redirectToLogin(req, res) {

From e171b544e922396957caf2a0eb1a88a9131d13c9 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 27 Aug 2015 16:43:14 -0400
Subject: [PATCH 3/3] fix 404 title on api calls

---
 src/routes/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/index.js b/src/routes/index.js
index 4d95ccb25f..67238e4dbe 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -189,7 +189,7 @@ function handle404(app, middleware) {
 			res.status(404);
 
 			if (res.locals.isAPI) {
-				return res.json({path: req.path});
+				return res.json({path: req.path, title: '[[global:404.title]]'});
 			}
 
 			middleware.buildHeader(req, res, function() {