Merge remote-tracking branch 'upstream/master'

src/websockets.js

@@ -717,10 +717,10 @@ websockets.init = function(io) {
 					return;
 				}
 
-				var finalMessage = username + ' : ' + msg,
+				var username = usersData[0].username,
-					notifText = 'New message from <strong>' + username + '</strong>',
+					toUsername = usersData[1].username,
-					username = usersData[0].username,
+					finalMessage = username + ' : ' + msg,
-					toUsername = usersData[1].username;
+					notifText = 'New message from <strong>' + username + '</strong>';
 
 				if (!isUserOnline(touid)) {
 					notifications.create(notifText, 'javascript:app.openChat(&apos;' + username + '&apos;, ' + uid + ');', 'notification_' + uid + '_' + touid, function(nid) {