From: Andrew Davis <andrew@affinitysoftware.net>
Date: Fri, 20 Nov 2009 02:28:39 +0000 (+0000)
Subject: datalib MDL-18470 Implemented more readable version of get_admin()
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=850262ee944c55869c08946eab2e8b48281e837c;p=moodle.git

datalib MDL-18470 Implemented more readable version of get_admin()
---

diff --git a/lib/datalib.php b/lib/datalib.php
index 6a5b1ca00c..e399ce2872 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -52,22 +52,15 @@ define('MAX_COURSE_CATEGORIES', 10000);
  * @return object An associative array representing the admin user.
  */
 function get_admin () {
-
-    global $CFG;
     static $myadmin;
 
-    if (isset($myadmin)) {
-        return $myadmin;
-    }
-
-    if ( $admins = get_admins() ) {
-        foreach ($admins as $admin) {
-            $myadmin = $admin;
-            return $admin;   // ie the first one
+    if (! isset($admin)) {
+        if (! $admins = get_admins()) {
+            return false;
         }
-    } else {
-        return false;
+        $admin = reset($admins);//reset returns first element
     }
+    return $admin;
 }
 
 /**