MDL-34657 system admins: main admin mis-identified in the UI.

moodle · Oct 4, 2012 · d057707 · d057707
1 parent c2004a7
commit d057707
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/admin/roles/lib.php b/admin/roles/lib.php
@@ -1596,13 +1596,10 @@ public function find_users($search) {
         }
 
         $mainadmin = array();
-        $adminids = explode(',', $CFG->siteadmins);
-        foreach ($adminids as $id) {
-            if (isset($availableusers[$id])) {
-                $mainadmin = array($id=>$availableusers[$id]);
-                unset($availableusers[$id]);
-                break;
-            }
+        $mainadminuser = get_admin();
+        if ($mainadminuser && isset($availableusers[$mainadminuser->id])) {
+            $mainadmin = array($mainadminuser->id => $availableusers[$mainadminuser->id]);
+            unset($availableusers[$mainadminuser->id]);
         }
 
         $result = array();