Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -90,9 +90,9 @@
         "nodebb-plugin-spam-be-gone": "0.6.1",
         "nodebb-rewards-essentials": "0.0.13",
         "nodebb-theme-lavender": "5.0.9",
-        "nodebb-theme-persona": "9.1.25",
+        "nodebb-theme-persona": "9.1.26",
         "nodebb-theme-slick": "1.2.22",
-        "nodebb-theme-vanilla": "10.1.23",
+        "nodebb-theme-vanilla": "10.1.24",
         "nodebb-widget-essentials": "4.0.14",
         "nodemailer": "^5.0.0",
         "passport": "^0.4.0",

src/topics/unread.js

@@ -295,7 +295,9 @@ module.exports = function (Topics) {
 		var count = 3;
 		var done = false;
 		var hasUnblockedUnread = params.topicTimestamp > userLastReadTimestamp;
-
+		if (!params.blockedUids.length) {
+			return setImmediate(callback, null, hasUnblockedUnread);
+		}
 		async.whilst(function () {
 			return !done;
 		}, function (_next) {