mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin' into thread_options
This commit is contained in:
		| @@ -127,8 +127,8 @@ var	RDB = require('./redis.js'), | |||||||
| 				user.getUserFields(uid, ['username','reputation','picture'], function(data){ | 				user.getUserFields(uid, ['username','reputation','picture'], function(data){ | ||||||
| 					 | 					 | ||||||
| 					var timestamp = new Date().getTime(); | 					var timestamp = new Date().getTime(); | ||||||
|  | 					 | ||||||
| 					socket.in('topic_' + tid).emit('event:new_post', { | 					io.sockets.in('topic_' + tid).emit('event:new_post', { | ||||||
| 						'posts' : [ | 						'posts' : [ | ||||||
| 							{ | 							{ | ||||||
| 								'pid' : pid, | 								'pid' : pid, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user