Merge branch 'MDL-54994_31' of git://github.com/stronk7/moodle into M…

…OODLE_31_STABLE
moodle · Jul 4, 2016 · f852010 · f852010
2 parents 2a5bb77 + 7ef6433
commit f852010
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/badgeslib.php b/lib/badgeslib.php
@@ -1089,7 +1089,7 @@ function get_backpack_settings($userid, $refresh = false) {
                 $badges = $backpack->get_badges($collection->collectionid);
                 if (isset($badges->badges)) {
                     $out->badges = array_merge($out->badges, $badges->badges);
-                    $out->totalbadges += count($out->badges);
+                    $out->totalbadges += count($badges->badges);
                 } else {
                     $out->badges = array_merge($out->badges, array());
                 }