Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-26 16:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	public/src/app.js
	public/src/client/account/edit.js
This commit is contained in:
Julian Lam
2015-10-07 02:14:03 -04:00
parent 896abb59d3 8b3f1684f7
commit 4c96f95330
180 changed files with 1034 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/socket.io/posts/favourites.js
View File

@@ -9,6 +9,7 @@ var favourites = require('../../favourites');
var plugins = require('../../plugins');
var websockets = require('../index');
var privileges = require('../../privileges');
var socketHelpers = require('../helpers');
module.exports = function(SocketPosts) {
SocketPosts.getVoters = function(socket, data, callback) {
@@ -148,7 +149,7 @@ module.exports = function(SocketPosts) {
}
if (result && notification) {
SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, notification);
socketHelpers.sendNotificationToPostOwner(data.pid, socket.uid, notification);
}
callback();
});

4
src/socket.io/posts/move.js
View File

@@ -3,7 +3,7 @@
var async = require('async');
var privileges = require('../../privileges');
var topics = require('../../topics');
var socketHelpers = require('../helpers');
module.exports = function(SocketPosts) {
@@ -28,7 +28,7 @@ module.exports = function(SocketPosts) {
topics.movePostToTopic(data.pid, data.tid, next);
},
function (next) {
SocketPosts.sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:moved_your_post');
socketHelpers.sendNotificationToPostOwner(data.pid, socket.uid, 'notifications:moved_your_post');
next();
}
], callback);