From 6ca06a8e542fbc8c961f9b7df94dede504d17c76 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 6 Oct 2014 16:16:31 -0400
Subject: [PATCH] closes #2233

---
 public/language/en_GB/groups.json | 1 +
 src/controllers/accounts.js       | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json
index 954c9780e5..cc4aeb8997 100644
--- a/public/language/en_GB/groups.json
+++ b/public/language/en_GB/groups.json
@@ -1,4 +1,5 @@
 {
+	"groups": "Groups",
 	"view_group": "View Group",
 
 	"details.title": "Group Details",
diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js
index 31d6578ac3..7c2ec8ef6b 100644
--- a/src/controllers/accounts.js
+++ b/src/controllers/accounts.js
@@ -12,6 +12,7 @@ var fs = require('fs'),
 	user = require('../user'),
 	posts = require('../posts'),
 	topics = require('../topics'),
+	groups = require('../groups'),
 	messaging = require('../messaging'),
 	postTools = require('../postTools'),
 	utils = require('../../public/src/utils'),
@@ -70,6 +71,9 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
 			},
 			profile_links: function(next) {
 				plugins.fireHook('filter:user.profileLinks', [], next);
+			},
+			groups: function(next) {
+				groups.getUserGroups([uid], next);
 			}
 		}, function(err, results) {
 			if(err || !results.userData) {
@@ -108,17 +112,18 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
 				userData.ips = results.ips;
 			}
 
-			userData.websiteName = userData.website.replace('http://', '').replace('https://', '');
-			userData.banned = parseInt(userData.banned, 10) === 1;
 			userData.uid = userData.uid;
 			userData.yourid = callerUID;
 			userData.theirid = userData.uid;
 			userData.isSelf = self;
 			userData.showSettings = self || isAdmin;
+			userData.groups = Array.isArray(results.groups) && results.groups.length ? results.groups[0] : [];
 			userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
 			userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
 			userData.profile_links = results.profile_links;
 			userData.status = !websockets.isUserOnline(userData.uid) ? 'offline' : userData.status;
+			userData.banned = parseInt(userData.banned, 10) === 1;
+			userData.websiteName = userData.website.replace('http://', '').replace('https://', '');
 
 			userData.followingCount = results.followStats.followingCount;
 			userData.followerCount = results.followStats.followerCount;