mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-07-11 14:32:21 +02:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -717,10 +717,10 @@ websockets.init = function(io) {
|
||||
return;
|
||||
}
|
||||
|
||||
var finalMessage = username + ' : ' + msg,
|
||||
notifText = 'New message from <strong>' + username + '</strong>',
|
||||
username = usersData[0].username,
|
||||
toUsername = usersData[1].username;
|
||||
var username = usersData[0].username,
|
||||
toUsername = usersData[1].username,
|
||||
finalMessage = username + ' : ' + msg,
|
||||
notifText = 'New message from <strong>' + username + '</strong>';
|
||||
|
||||
if (!isUserOnline(touid)) {
|
||||
notifications.create(notifText, 'javascript:app.openChat('' + username + '', ' + uid + ');', 'notification_' + uid + '_' + touid, function(nid) {
|
||||
|
||||
Reference in New Issue
Block a user