From 6be5bcc4c8c6e3b66443af40e23b32499eae8e7d Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Thu, 19 Sep 2013 20:43:56 -0400
Subject: [PATCH] closes #308

---
 public/templates/admin/header.tpl |  2 ++
 public/templates/config.json      |  2 +-
 src/routes/user.js                | 10 ++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index ed5ff90413..7c236cff58 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -17,8 +17,10 @@
 	<script type="text/javascript" src="{relative_path}/src/app.js"></script>
 	<script type="text/javascript" src="{relative_path}/src/templates.js"></script>
 	<script type="text/javascript" src="{relative_path}/src/ajaxify.js"></script>
+	<script src="{relative_path}/vendor/jquery/js/jquery.timeago.js"></script>
 	<script src="{relative_path}/vendor/requirejs/require.js"></script>
 	<script src="{relative_path}/vendor/bootbox/bootbox.min.js"></script>
+
 	<script>
 		require.config({
 			baseUrl: "{relative_path}/src/modules",
diff --git a/public/templates/config.json b/public/templates/config.json
index 3d8af7fa59..c478149352 100644
--- a/public/templates/config.json
+++ b/public/templates/config.json
@@ -8,7 +8,7 @@
 		"admin/index[^]*": "admin/index",
 		"admin/themes[^]*": "admin/themes",
 		"admin/plugins[^]*": "admin/plugins",
-		"admin/settings[^]*": "admin/settings",
+		"^admin/settings[^]*": "admin/settings",
 		"admin/twitter[^]*": "admin/twitter",
 		"admin/facebook[^]*": "admin/facebook",
 		"admin/gplus[^]*": "admin/gplus",
diff --git a/src/routes/user.js b/src/routes/user.js
index 1c60e247d4..cd8e60de1e 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -332,12 +332,14 @@ var user = require('./../user.js'),
 					return;
 				}
 
-				if (uid !== callerUID || callerUID === '0') {
+				if (uid != callerUID || callerUID == '0') {
 					res.json(403, {
 						error: 'Not allowed!'
 					});
 					return;
 				}
+
+				
 				user.getUserFields(uid, ['username', 'userslug', 'showemail'], function(err, userData) {
 					if (err)
 						return next(err);
@@ -368,7 +370,7 @@ var user = require('./../user.js'),
 					return;
 				}
 
-				if (uid !== callerUID || callerUID === '0') {
+				if (uid != callerUID || callerUID == '0') {
 					res.json(403, {
 						error: 'Not allowed!'
 					});
@@ -491,13 +493,13 @@ var user = require('./../user.js'),
 						}
 
 						function canSeeEmail() {
-							return callerUID === uid || (data.email && (data.showemail && data.showemail === "1"));
+							return callerUID == uid || (data.email && (data.showemail && data.showemail === "1"));
 						}
 
 						if (!canSeeEmail())
 							data.email = "";
 
-						if (callerUID === uid && (!data.showemail || data.showemail === "0"))
+						if (callerUID == uid && (!data.showemail || data.showemail === "0"))
 							data.emailClass = "";
 						else
 							data.emailClass = "hide";