Merge remote-tracking branch 'origin/master'

v1.18.x
psychobunny 10 years ago
commit 7420351eb7

@ -310,7 +310,8 @@ SocketUser.follow = function(socket, data, callback) {
notifications.create({
bodyShort: '[[notifications:user_started_following_you, ' + userData.username + ']]',
nid: 'follow:' + data.uid + ':uid:' + socket.uid,
from: socket.uid
from: socket.uid,
path: '/user/' + userData.userslug
}, next);
},
function(notification, next) {

Loading…
Cancel
Save