From 0eb4b938821ef870051028795c0f2b6f2429b711 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 25 Sep 2014 14:10:59 -0400
Subject: [PATCH] moved hasPassword to edit route

its only used there no need to display it everywhere user info is
retrieved
---
 src/controllers/accounts.js | 16 +++++++++++++---
 src/user.js                 |  1 -
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index ecaa5be6fa..9e49dfc3ee 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -8,6 +8,7 @@ var fs = require('fs'),
 	nconf = require('nconf'),
 	async= require('async'),
 
+	db = require('../database'),
 	user = require('../user'),
 	posts = require('../posts'),
 	topics = require('../topics'),
@@ -340,12 +341,21 @@ function getBaseUser(userslug, callerUID, callback) {
 
 accountsController.accountEdit = function(req, res, next) {
 	var callerUID = req.user ? parseInt(req.user.uid, 10) : 0;
-
-	getUserDataByUserSlug(req.params.userslug, callerUID, function (err, userData) {
-		if(err) {
+	var userData;
+	async.waterfall([
+		function(next) {
+			getUserDataByUserSlug(req.params.userslug, callerUID, next);
+		},
+		function(data, next) {
+			userData = data;
+			db.getObjectField('user:' + userData.uid, 'password', next);
+		}
+	], function(err, password) {
+		if (err) {
 			return next(err);
 		}
 
+		userData.hasPassword = !!password;
 		userData.csrf = req.csrfToken();
 
 		res.render('account/edit', userData);
diff --git a/src/user.js b/src/user.js
index 6cd8a125ea..f9ef005c6b 100644
--- a/src/user.js
+++ b/src/user.js
@@ -103,7 +103,6 @@ var	async = require('async'),
 				return;
 			}
 
-			user.hasPassword = !!user.password;
 			if (user.password) {
 				user.password = null;
 			}