mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 02:55:58 +01:00 
			
		
		
		
	merged master fixed conflicts
This commit is contained in:
		| @@ -1035,7 +1035,7 @@ var bcrypt = require('bcrypt'), | ||||
|  | ||||
| 		}, | ||||
| 		getUnreadCount: function(uid, callback) { | ||||
| 			db.sortedSetCount('uid:' + uid + ':notifications:unread', 0, 10, callback); | ||||
| 			db.sortedSetCount('uid:' + uid + ':notifications:unread', -Infinity, Infinity, callback); | ||||
| 		}, | ||||
| 		getUnreadByUniqueId: function(uid, uniqueId, callback) { | ||||
| 			db.getSortedSetRange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user