mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 19:15:58 +01:00 
			
		
		
		
	merged master fixed conflicts
This commit is contained in:
		| @@ -223,7 +223,7 @@ var db = require('./database'), | ||||
| 					} | ||||
| 				} | ||||
|  | ||||
| 				plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid}, function(err, profile_info) { | ||||
| 				plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid, pid: post.pid}, function(err, profile_info) { | ||||
| 					post.additional_profile_info = profile_info.profile; | ||||
|  | ||||
| 					if (post.editor !== '') { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user