Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-04 21:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Usakli
2013-11-15 13:39:14 -05:00
parent 84fa704b25 535379d9d7
commit 8c4f776122
5 changed files with 196 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/user.js
View File

@@ -191,11 +191,6 @@ var user = require('./../user.js'),
is.on('end', function () {
fs.unlinkSync(tempPath);
var imageUrl = nconf.get('upload_url') + filename;
user.setUserField(uid, 'uploadedpicture', imageUrl);
user.setUserField(uid, 'picture', imageUrl);
require('node-imagemagick').crop({
srcPath: uploadPath,
dstPath: uploadPath,
@@ -204,8 +199,17 @@ var user = require('./../user.js'),
}, function (err, stdout, stderr) {
if (err) {
winston.err(err);
res.send({
error: 'Invalid image file!'
});
return;
}
var imageUrl = nconf.get('upload_url') + filename;
user.setUserField(uid, 'uploadedpicture', imageUrl);
user.setUserField(uid, 'picture', imageUrl);
res.json({
path: imageUrl
});