Merge branch 'w05_MDL-26172_20_groupupgrade' of git://github.com/skodak/moodle

2011-01-31 15:17:33 +01:00
parent 7164db694c 73af286bc8
commit 9700d6835d
1 changed files with 4 additions and 1 deletions
@@ -244,7 +244,10 @@ function upgrade_migrate_group_icons() {
        upgrade_set_timeout(60); /// Give upgrade at least 60 more seconds
        $pbar->update($i, $count, "Migrated group icons  $i/$count.");

-        $context = get_context_instance(CONTEXT_COURSE, $group->courseid);
+        if (!$context = get_context_instance(CONTEXT_COURSE, $group->courseid)) {
+            debugging('Invalid group record (id=' . $group->id . ') found.');
+            continue;
+        }

        if ($fs->file_exists($context->id, 'group', 'icon', $group->id, '/', 'f1.jpg')) {
            // already converted!