From: skodak <skodak>
Date: Mon, 24 Sep 2007 19:00:39 +0000 (+0000)
Subject: fixed notice during upgrade from 1.8
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a0759965725f1266b47b1853358de83789a47331;p=moodle.git

fixed notice during upgrade from 1.8
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index e4040e1e3c..1818e0d0f4 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -228,15 +228,16 @@ function get_role_access($roleid, $accessdata=NULL) {
             WHERE rc.roleid = {$roleid}
                   AND ctx.contextlevel <= ".CONTEXT_COURSE."
             ORDER BY ctx.depth, ctx.path";
-    $rs = get_recordset_sql($sql);
-    if ($rs->RecordCount()) {
-        while ($rd = rs_fetch_next_record($rs)) {
-            $k = "{$rd->path}:{$roleid}";
-            $accessdata['rdef'][$k][$rd->capability] = $rd->permission;
+    if ($rs = get_recordset_sql($sql)) {
+        if ($rs->RecordCount()) {
+            while ($rd = rs_fetch_next_record($rs)) {
+                $k = "{$rd->path}:{$roleid}";
+                $accessdata['rdef'][$k][$rd->capability] = $rd->permission;
+            }
+            unset($rd);
         }
-        unset($rd);
+        rs_close($rs);
     }
-    rs_close($rs);
 
     return $accessdata;
 }