From 9f1e0187ee8fb14d63b50bcf6575ad099e184b65 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 12 Feb 2014 00:09:02 -0500
Subject: [PATCH] fixed settings

---
 public/templates/accountsettings.tpl |  9 ++++++++-
 src/routes/user.js                   |  3 ++-
 src/topics.js                        | 27 ++++++++++++++++-----------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index 54114e9415..82bf8b6517 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -1,3 +1,7 @@
+<div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
+
+</div>
+
 <div class="account">
 	<div class="row">
 		<div class="col-xs-12">
@@ -33,4 +37,7 @@
 	<div class="form-actions">
 		<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
 	</div>
-</div>
\ No newline at end of file
+</div>
+
+<input type="hidden" template-variable="yourid" value="{yourid}" />
+<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
diff --git a/src/routes/user.js b/src/routes/user.js
index f149d4469b..af926a514a 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -342,7 +342,8 @@ var fs = require('fs'),
 								error: 'User not found!'
 							});
 						}
-
+						userData.yourid = req.user.uid;
+						userData.theirid = uid;
 						userData.settings = settings;
 						res.json(userData);
 					});
diff --git a/src/topics.js b/src/topics.js
index 3f57a239d9..e1c0b8d2ab 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -675,10 +675,8 @@ var async = require('async'),
 
 	Topics.getTopicsByTids = function(tids, cid, current_user, callback) {
 
-		var retrieved_topics = [];
-
 		if (!Array.isArray(tids) || tids.length === 0) {
-			return callback(null, retrieved_topics);
+			return callback(null, []);
 		}
 
 		function getTopicInfo(topicData, callback) {
@@ -748,6 +746,10 @@ var async = require('async'),
 						return next(err);
 					}
 
+					if (!isTopicVisible(topicData, topicInfo)) {
+						return next();
+					}
+
 					topicData['pin-icon'] = parseInt(topicData.pinned, 10) === 1 ? 'fa-thumb-tack' : 'none';
 					topicData['lock-icon'] = parseInt(topicData.locked, 10) === 1 ? 'fa-lock' : 'none';
 					topicData['deleted-class'] = parseInt(topicData.deleted, 10) === 1 ? 'deleted' : '';
@@ -768,19 +770,22 @@ var async = require('async'),
 					topicData.teaser_pid = topicInfo.teaserInfo.pid;
 					topicData.teaser_timestamp = utils.toISOString(topicInfo.teaserInfo.timestamp);
 
-					if (isTopicVisible(topicData, topicInfo)) {
-						retrieved_topics.push(topicData);
-					}
-
-					next(null);
+					next(null, topicData);
 				});
 			});
 		}
 
-		async.eachSeries(tids, loadTopic, function(err) {
-			callback(err, retrieved_topics);
-		});
+		async.map(tids, loadTopic, function(err, topics) {
+			if(err) {
+				return callback(err);
+			}
 
+			topics = topics.filter(function(topic) {
+				return !!topic;
+			});
+
+			callback(null, topics);
+		});
 	}
 
 	Topics.getTopicWithPosts = function(tid, current_user, start, end, quiet, callback) {