mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-11-03 20:45:58 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into flagging-refactor
This commit is contained in:
		@@ -8,6 +8,7 @@ var groups = require('../../groups');
 | 
			
		||||
var user = require('../../user');
 | 
			
		||||
var events = require('../../events');
 | 
			
		||||
var meta = require('../../meta');
 | 
			
		||||
var plugins = require('../../plugins');
 | 
			
		||||
 | 
			
		||||
var User = {};
 | 
			
		||||
 | 
			
		||||
@@ -169,6 +170,13 @@ function deleteUsers(socket, uids, method, callback) {
 | 
			
		||||
					uid: socket.uid,
 | 
			
		||||
					targetUid: uid,
 | 
			
		||||
					ip: socket.ip
 | 
			
		||||
				}, next);
 | 
			
		||||
			},
 | 
			
		||||
			function (next) {
 | 
			
		||||
				plugins.fireHook('action:user.delete', {
 | 
			
		||||
					callerUid: socket.uid,
 | 
			
		||||
					uid: uid,
 | 
			
		||||
					ip: socket.ip
 | 
			
		||||
				});
 | 
			
		||||
				next();
 | 
			
		||||
			}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user