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

prevent double res.send/json if error occurs in profile image upload

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-08 02:59:14 -05:00
parent 2d384a68d2
commit 0d26b21a2c
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/routes/user.js
View File

@@ -176,8 +176,7 @@ var fs = require('fs'),
user.setUserField(uid, 'picture', imageUrl); user.setUserField(uid, 'picture', imageUrl);
if (convertToPNG && extension !== '.png') { if (convertToPNG && extension !== '.png') {
im.convert([uploadPath, 'png:-'], im.convert([uploadPath, 'png:-'], function(err, stdout) {
function(err, stdout){
if (err) { if (err) {
winston.err(err); winston.err(err);
res.send({ res.send({
@@ -187,12 +186,15 @@ var fs = require('fs'),
} }
fs.writeFileSync(uploadPath, stdout, 'binary'); fs.writeFileSync(uploadPath, stdout, 'binary');
});
}
res.json({ res.json({
path: imageUrl path: imageUrl
}); });
});
} else {
res.json({
path: imageUrl
});
}
} }
if(extension === '.gif') { if(extension === '.gif') {