Fixes for isadmin()

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 46ac26a815529568e353d3a1fb750946c6b70eeb..ee69d5cb7074fa3d36c5b391710223be35d9d940 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -371,30 +371,30 @@ function reset_login_count() {
     $SESSION->logincount = 0;
 }
 
-function isadmin($userid=false) {
+function isadmin($userid=0) {
 /// Is the user an admin?
     global $USER;
     static $admins = array();
     static $nonadmins = array();
 
-    if (empty($USER->id)) {
-        return false;
+    if (!$userid){
+        if (empty($USER->id)) {
+            return false;
+        }
+        $userid = $USER->id;
     }
 
-    $checkid = $userid ? $userid : $USER->id;
-
-    if (in_array($checkid, $admins)) {
+    if (in_array($userid, $admins)) {
         return true;
-    } elseif (in_array($ceckid, $nonadmins)) {
+    } else if (in_array($userid, $nonadmins)) {
         return false;
-    } elseif (record_exists("user_admins", "userid", $checkid)){
-        $admins[] = $checkid;
+    } else if (record_exists("user_admins", "userid", $userid)){
+        $admins[] = $userid;
         return true;
     } else {
-        $nonadmins[] = $checkid;
+        $nonadmins[] = $userid;
         return false;
     }
-
 }
 
 function isteacher($courseid, $userid=0) {