Merge branch 'MDL-54994_30' of git://github.com/stronk7/moodle into MOODLE_30_STABLE

2016-07-04 14:18:21 +01:00
parent d4a279464e 256c202cab
commit ed577ebd43
1 changed files with 1 additions and 1 deletions
@@ -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());
                }