From de7092fe1f45f01004342d079d6bb4144be4e8ce Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 20 Nov 2009 02:26:40 +0000 Subject: [PATCH] datalib MDL-18470 Implemented more readable version of get_admin() --- lib/datalib.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index 49a640158ec6b..8deabb7354ca8 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -42,22 +42,15 @@ function addslashes_object( $dataobject ) { * @return object(admin) 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; } /**