Merge branch 'MDL-42863_25' of git://github.com/timhunt/moodle into MOODLE_25_STABLE

2013-11-19 12:03:25 +13:00
parent a073d7c8b0 c48f58ba9f
commit 37c71ce3cc
1 changed files with 9 additions and 3 deletions
@@ -139,9 +139,15 @@ if ($capability) {
    // Put the contexts into a tree structure.
    foreach ($contexts as $conid => $con) {
        $context = context::instance_by_id($conid);
-        $parentcontextid = get_parent_contextid($context);
-        if ($parentcontextid) {
-            $contexts[$parentcontextid]->children[] = $conid;
+        try {
+            $parentcontext = $context->get_parent_context();
+            if ($parentcontext) { // Will be false if $context is the system context.
+                $contexts[$parentcontext->id]->children[] = $conid;
+            }
+        } catch (dml_missing_record_exception $e) {
+            // Ignore corrupt context tree structure here. Don't let it break
+            // showing the rest of the report.
+            continue;
        }
    }