Merge branch 'MDL-63913-master' of https://github.com/snake/moodle

2018-11-19 14:59:39 +08:00
parent 365dce5fad a54115355a
commit 237786f159
2 changed files with 12 additions and 6 deletions
@@ -2968,10 +2968,11 @@ class api {
            self::MESSAGE_CONVERSATION_TYPE_GROUP => 0
        ]];
        foreach ($unreadcounts as $convid => $info) {
-            $counts['types'][$info->type]++;
            if (isset($favouriteconvids[$convid])) {
                $counts['favourites']++;
+                continue;
            }
+            $counts['types'][$info->type]++;
        }

        return $counts;