From d0577078fa97ffd96c692946593644937620f62d Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Thu, 4 Oct 2012 11:44:50 +0100
Subject: [PATCH] MDL-34657 system admins: main admin mis-identified in the UI.

---
 admin/roles/lib.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index 078d2efc8a1..5765cf59ae6 100644
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -1596,13 +1596,10 @@ class admins_existing_selector extends user_selector_base {
         }
 
         $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();