closes #2209

src/socket.io/modules.js

@@ -192,6 +192,15 @@ SocketModules.chats.send = function(socket, data, callback) {
 
 	var msg = S(data.message).stripTags().s;
 
+	user.getUserField(socket.uid, 'banned', function(err, banned) {
+		if (err) {
+			return callback(err);
+		}
+
+		if (parseInt(banned, 10) === 1) {
+			return callback(new Error('[[error:user-banned]]'));
+		}
+
 		Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
 			if (err) {
 				return callback(err);
@@ -215,6 +224,7 @@ SocketModules.chats.send = function(socket, data, callback) {
 				self: 1
 			});
 		});
+	});
 };
 
 SocketModules.chats.pushUnreadCount = function(uid) {

src/user.js

@@ -111,6 +111,7 @@ var	async = require('async'),
 				user.uid = 0;
 				user.username = '[[global:guest]]';
 				user.userslug = '';
+				user.picture = User.createGravatarURLFromEmail('');
 			}
 
 			if (user.picture) {
@@ -119,8 +120,6 @@ var	async = require('async'),
 				} else {
 					user.picture = User.createGravatarURLFromEmail(user.email);
 				}
-			} else {
-				user.picture = User.createGravatarURLFromEmail('');
 			}
 
 			for(var i=0; i<fieldsToRemove.length; ++i) {