Merge branch 'MDL-25708' of git://github.com/stronk7/moodle

[moodle.git] / mod / resource / db / upgradelib.php

diff --git a/mod/resource/db/upgradelib.php b/mod/resource/db/upgradelib.php
index 4162614..b8ec4e1 100644 (file)
--- a/mod/resource/db/upgradelib.php
+++ b/mod/resource/db/upgradelib.php
@@ -55,7 +55,11 @@ function resource_20_migrate() {
         $siteid = get_site()->id;
         $fs = get_file_storage();
 
-        if (strpos($path, 'LOCALPATH') === 0) {
+        if (empty($candidate->cmid)) {
+            // skip borked records
+            continue;
+
+        } else if (strpos($path, 'LOCALPATH') === 0) {
             // ignore not maintained local files - sorry
             continue;