Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-04 14:07:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed #4277

Browse Source
This commit is contained in:
Julian Lam
2016-02-26 14:27:03 -05:00
parent 5556c49f74
commit 13623a620b
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/socket.io/user/picture.js
View File

@@ -2,6 +2,7 @@
var async = require('async');
var winston = require('winston');
var path = require('path');
var user = require('../../user');
var plugins = require('../../plugins');
@@ -73,20 +74,21 @@ module.exports = function(SocketUser) {
user.isAdminOrSelf(socket.uid, data.uid, next);
},
function (next) {
user.getUserField(data.uid, 'uploadedpicture', next);
user.getUserFields(data.uid, ['uploadedpicture', 'picture'], next);
},
function(uploadedPicture, next) {
if (!uploadedPicture.startsWith('http')) {
require('fs').unlink(uploadedPicture, function(err) {
function(userData, next) {
if (!userData.uploadedpicture.startsWith('http')) {
require('fs').unlink(path.join(__dirname, '../../../public', userData.uploadedpicture), function(err) {
if (err) {
winston.error(err);
}
});
}
user.setUserField(data.uid, 'uploadedpicture', '', next);
},
function(next) {
user.getUserField(data.uid, 'picture', next);
user.setUserFields(data.uid, {
uploadedpicture: '',
picture: userData.uploadedpicture === userData.picture ? '' : userData.picture // if current picture is uploaded picture, reset to user icon
}, next);
}
], callback);
};