From cd5fdfd87a910bda6a1caad185d25103b54ccca4 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Sat, 22 Jan 2011 13:34:28 +0100
Subject: [PATCH] MDL-25708 recordsets - tag and user directory

---
 tag/lib.php           | 15 +++++++--------
 user/selector/lib.php |  9 ++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/tag/lib.php b/tag/lib.php
index ae9e4c0c646..c1d96c30696 100644
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -409,16 +409,15 @@ function tag_get_id($tags, $return_value=null) {
 
     list($tag_string, $params) = $DB->get_in_or_equal($tags);
 
-    if ($rs = $DB->get_recordset_sql("SELECT * FROM {tag} WHERE name $tag_string ORDER BY name", $params)) {
-        foreach ($rs as $record) {
-            if ($return_value == TAG_RETURN_OBJECT) {
-                $result[$record->name] = $record;
-            } else { // TAG_RETURN_ARRAY
-                $result[$record->name] = $record->id;
-            }
+    $rs = $DB->get_recordset_sql("SELECT * FROM {tag} WHERE name $tag_string ORDER BY name", $params);
+    foreach ($rs as $record) {
+        if ($return_value == TAG_RETURN_OBJECT) {
+            $result[$record->name] = $record;
+        } else { // TAG_RETURN_ARRAY
+            $result[$record->name] = $record->id;
         }
-        $rs->close();
     }
+    $rs->close();
 
     if ($return_an_int) {
         return array_pop($result);
diff --git a/user/selector/lib.php b/user/selector/lib.php
index c6215dbc798..0aba4e37483 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -763,12 +763,11 @@ class group_non_members_selector extends groups_user_selector_base {
                     JOIN {groups} g ON gm.groupid = g.id
                     WHERE u.id $membersidsclause AND g.courseid = :courseid ";
             $params['courseid'] = $courseid;
-            if ($rs = $DB->get_recordset_sql($sql, $params)) {
-                foreach ($rs as $usergroup) {
-                    $usergroups[$usergroup->userid][$usergroup->id] = $usergroup;
-                }
-                $rs->close();
+            $rs = $DB->get_recordset_sql($sql, $params);
+            foreach ($rs as $usergroup) {
+                $usergroups[$usergroup->userid][$usergroup->id] = $usergroup;
             }
+            $rs->close();
 
             foreach ($potentialmembersids as $userid) {
                 if (isset($usergroups[$userid])) {