Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 20:45:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source
This commit is contained in:
Julian Lam
2015-10-25 07:34:23 -04:00
parent b52475c270 8ac917c63c
commit f7f43de644
13 changed files with 156 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/posts/user.js
View File

@@ -40,10 +40,12 @@ module.exports = function(Posts) {
slug: group.slug,
labelColor: group.labelColor,
icon: group.icon,
userTitle: group.userTitle,
userTitleEnabled: group.userTitleEnabled,
selected: group.name === results.userSettings[i].groupTitle
userTitle: group.userTitle
};
if (group.name === results.userSettings[i].groupTitle && group.userTitleEnabled) {
userData.selectedGroup = userData.groups[index];
}
});
userData.status = user.getStatus(userData.status, results.online[i]);
});