closes #5504

public/src/client/account/edit.js

@@ -241,22 +241,29 @@ define('forum/account/edit', ['forum/account/header', 'translator', 'components'
 					uploadModal.find('.upload-btn').on('click', function () {
 						var url = uploadModal.find('#uploadFromUrl').val();
 						if (!url) {
-							return;
+							return false;
 						}
-
+						socket.emit('user.uploadProfileImageFromUrl', {
-						uploadModal.modal('hide');
+							uid: ajaxify.data.uid,
-
-						pictureCropper.handleImageCrop({
 							url: url,
-							socketMethod: 'user.uploadCroppedPicture',
+						}, function (err, url) {
-							aspectRatio: '1 / 1',
+							if (err) {
-							allowSkippingCrop: false,
+								return app.alertError(err);
-							restrictImageDimension: true,
+							}
-							imageDimension: ajaxify.data.profileImageDimension,
-							paramName: 'uid',
-							paramValue: ajaxify.data.theirid,
-						}, onUploadComplete);
 
+							uploadModal.modal('hide');
+
+							pictureCropper.handleImageCrop({
+								url: url,
+								socketMethod: 'user.uploadCroppedPicture',
+								aspectRatio: '1 / 1',
+								allowSkippingCrop: false,
+								restrictImageDimension: true,
+								imageDimension: ajaxify.data.profileImageDimension,
+								paramName: 'uid',
+								paramValue: ajaxify.data.theirid,
+							}, onUploadComplete);
+						});
 						return false;
 					});
 				});

src/user/picture.js

@@ -50,12 +50,7 @@ module.exports = function (User) {
 				}, next);
 			},
 			function (image, next) {
-				User.setUserFields(uid, {
+				next(null, image);
-					uploadedpicture: image.url,
-					picture: image.url,
-				}, function (err) {
-					next(err, image);
-				});
 			},
 		], callback);
 	};