From 73e281cdc4a2b7b2381a01c6c5ca2dba79d68083 Mon Sep 17 00:00:00 2001
From: Brendan Heywood <brendan@catalyst-au.net>
Date: Thu, 25 Feb 2016 11:50:27 +1100
Subject: [PATCH] MDL-53234 admin: Fixed wrong default support email bug

---
 admin/settings/server.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin/settings/server.php b/admin/settings/server.php
index cc43e70275b..573ed4b196f 100644
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -18,11 +18,10 @@ $ADMIN->add('server', $temp);
 
 // "supportcontact" settingpage
 $temp = new admin_settingpage('supportcontact', new lang_string('supportcontact','admin'));
-if (isloggedin()) {
-    global $USER;
-    $primaryadminemail = $USER->email;
-    $primaryadminname  = fullname($USER, true);
-
+$primaryadmin = get_admin();
+if ($primaryadmin) {
+    $primaryadminemail = $primaryadmin->email;
+    $primaryadminname  = fullname($primaryadmin, true);
 } else {
     // no defaults during installation - admin user must be created first
     $primaryadminemail = NULL;