SCORM MDL-21568 fix regression

[moodle.git] / mod / scorm / db / upgrade.php

diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index 9c1f712..413dff2 100644 (file)
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -40,9 +40,11 @@ function xmldb_scorm_upgrade($oldversion) {
             if (empty($whatgradefixed)) {
                 /// fix bad usage of whatgrade/grading method.
                 $scorms = $DB->get_records('scorm');
             if (empty($whatgradefixed)) {
                 /// fix bad usage of whatgrade/grading method.
                 $scorms = $DB->get_records('scorm');

-                foreach ($scorms as $scorm) {
-                    $scorm->whatgrade = $scorm->grademethod/10;
-                    $DB->update_record('scorm', $scorm);
+                if (!empty($scorm)) {
+                    foreach ($scorms as $scorm) {
+                        $scorm->whatgrade = $scorm->grademethod/10;
+                        $DB->update_record('scorm', $scorm);
+                    }

                 }
             }
         } else {
                 }
             }
         } else {


@@ -473,9 +475,11 @@ function xmldb_scorm_upgrade($oldversion) {
         if (empty($grademethodfixed)) {
             /// fix bad usage of whatgrade/grading method.
             $scorms = $DB->get_records('scorm');
         if (empty($grademethodfixed)) {
             /// fix bad usage of whatgrade/grading method.
             $scorms = $DB->get_records('scorm');

-            foreach ($scorms as $scorm) {
-                $scorm->grademethod = $scorm->grademethod%10;
-                $DB->update_record('scorm', $scorm);
+            if (!empty($scorm)) {
+                foreach ($scorms as $scorm) {
+                    $scorm->grademethod = $scorm->grademethod%10;
+                    $DB->update_record('scorm', $scorm);
+                }

             }
         } else {
             //dump this config var as it isn't needed anymore.
             }
         } else {
             //dump this config var as it isn't needed anymore.