MDL-25708 recordsets - scorm module

diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index ba04865..445799f 100644 (file)
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -140,7 +140,8 @@ function xmldb_scorm_upgrade($oldversion) {
 
         $count = $DB->count_records_sql("SELECT COUNT('x') $sqlfrom");
 
-        if ($rs = $DB->get_recordset_sql("SELECT s.id, s.scormtype, s.reference, s.course, cm.id AS cmid $sqlfrom ORDER BY s.course, s.id")) {
+        $rs = $DB->get_recordset_sql("SELECT s.id, s.scormtype, s.reference, s.course, cm.id AS cmid $sqlfrom ORDER BY s.course, s.id");
+        if ($rs->valid()) {
 
             $pbar = new progress_bar('migratescormfiles', 500, true);
 
@@ -213,8 +214,8 @@ function xmldb_scorm_upgrade($oldversion) {
                 @rmdir("$CFG->dataroot/$scorm->course/$CFG->moddata/scorm/");
                 @rmdir("$CFG->dataroot/$scorm->course/$CFG->moddata/");
             }
-            $rs->close();
         }
+        $rs->close();
 
     /// scorm savepoint reached
         upgrade_mod_savepoint(true, 2008090304, 'scorm');

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 6c985f8..88ecd28 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -575,7 +575,8 @@ function scorm_upgrade_grades() {
     $sql = "SELECT s.*, cm.idnumber AS cmidnumber, s.course AS courseid
               FROM {scorm} s, {course_modules} cm, {modules} m
              WHERE m.name='scorm' AND m.id=cm.module AND cm.instance=s.id";
-    if ($rs = $DB->get_recordset_sql($sql)) {
+    $rs = $DB->get_recordset_sql($sql);
+    if ($rs->valid()) {
         $pbar = new progress_bar('scormupgradegrades', 500, true);
         $i=0;
         foreach ($rs as $scorm) {
@@ -584,8 +585,8 @@ function scorm_upgrade_grades() {
             scorm_update_grades($scorm, 0, false);
             $pbar->update($i, $count, "Updating Scorm grades ($i/$count).");
         }
-        $rs->close();
     }
+    $rs->close();
 }
 
 /**