Merge pull request #5319 from pichalite/issue-5317

Let global mods change user avatar

src/socket.io/user/picture.js

@@ -23,7 +23,7 @@ module.exports = function (SocketUser) {
 
 		async.waterfall([
 			function (next) {
-				user.isAdminOrSelf(socket.uid, data.uid, next);
+				user.isAdminOrGlobalModOrSelf(socket.uid, data.uid, next);
 			},
 			function (next) {
 				switch(type) {

src/user.js

@@ -276,6 +276,18 @@ var meta = require('./meta');
 			callback();
 		});
 	};
+	
+	User.isAdminOrGlobalModOrSelf = function (callerUid, uid, callback) {
+		if (parseInt(callerUid, 10) === parseInt(uid, 10)) {
+			return callback();
+		}
+		User.isAdminOrGlobalMod(callerUid, function (err, isAdminOrGlobalMod) {
+			if (err || !isAdminOrGlobalMod) {
+				return callback(err || new Error('[[error:no-privileges]]'));
+			}
+			callback();
+		});
+	};
 
 	User.getAdminsandGlobalMods = function (callback) {
 		async.parallel({