Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-26 21:16:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into user-icons

Browse Source
This commit is contained in:
nodebb-misty
2015-10-29 15:29:42 -04:00
parent ae43c16227 aa3fa477e3
commit 4ec57d4110
6 changed files with 69 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/helpers.js
View File

@@ -140,7 +140,7 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
results.user.showHidden = results.user.isSelf || results.isAdmin;
results.user.profile_links = results.profile_links;
results['cover:url'] = results['cover:url'] || nconf.get('relative_path') + '/images/cover-default.png';
results['cover:url'] = results['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(results.user.uid);
results['cover:position'] = results['cover:position'] || '50% 50%';
next(null, results.user);

5
src/controllers/accounts/profile.js
View File

@@ -72,6 +72,11 @@ profileController.get = function(req, res, callback) {
userData.isFollowing = results.isFollowing;
userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username}]);
userData.title = userData.username;
userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid);
userData['cover:position'] = userData['cover:position'] || '50% 50%';
console.log(userData['cover:url']);
if (!userData.profileviews) {
userData.profileviews = 1;
}