From 8ce9a2b26d2cbfc6b1bf60cb699fae1fc644176e Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Thu, 13 Jan 2011 15:39:27 +0100
Subject: [PATCH] MDL-25708 recordsets - resource module

---
 mod/resource/db/upgrade.php    | 20 ++++++++++----------
 mod/resource/db/upgradelib.php |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
index dc2982554b9..f5478ba2376 100644
--- a/mod/resource/db/upgrade.php
+++ b/mod/resource/db/upgrade.php
@@ -226,17 +226,17 @@ function xmldb_resource_upgrade($oldversion) {
                   JOIN {modules} m ON m.name='resource'
                   JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = r.id)";
 
-        if ($instances = $DB->get_recordset_sql($sql)) {
-            foreach ($instances as $instance) {
-                $context  = get_context_instance(CONTEXT_MODULE, $instance->cmid);
-                $component = 'mod_resource';
-                $filearea = 'content';
-                $itemid   = 0;
-                $filepath = file_correct_filepath(dirname($instance->mainfile));
-                $filename = basename($instance->mainfile);
-                file_set_sortorder($context->id, $component, $filearea, $itemid, $filepath, $filename, 1);
-            }
+        $instances = $DB->get_recordset_sql($sql);
+        foreach ($instances as $instance) {
+            $context  = get_context_instance(CONTEXT_MODULE, $instance->cmid);
+            $component = 'mod_resource';
+            $filearea = 'content';
+            $itemid   = 0;
+            $filepath = file_correct_filepath(dirname($instance->mainfile));
+            $filename = basename($instance->mainfile);
+            file_set_sortorder($context->id, $component, $filearea, $itemid, $filepath, $filename, 1);
         }
+        $instances->close();
 
      /// Define field mainfile to be dropped from resource
         $table = new xmldb_table('resource');
diff --git a/mod/resource/db/upgradelib.php b/mod/resource/db/upgradelib.php
index df04b0c4701..41626142ed6 100644
--- a/mod/resource/db/upgradelib.php
+++ b/mod/resource/db/upgradelib.php
@@ -42,7 +42,9 @@ function resource_20_migrate() {
     $withrelativelinks = array('text/html', 'text/xml', 'application/xhtml+xml', 'application/x-shockwave-flash');
     // note: pdf doc and other types may contain links too, but we do not support relative links there
 
-    if (!$candidates = $DB->get_recordset('resource_old', array('type'=>'file', 'migrated'=>0))) {
+    $candidates = $DB->get_recordset('resource_old', array('type'=>'file', 'migrated'=>0));
+    if (!$candidates->valid()) {
+        $candidates->close(); // Not going to iterate (but exit), close rs
         return;
     }