Merge branch 'MDL-53234-support-email-MOODLE_29_STABLE' of https://gi…

…thub.com/brendanheywood/moodle into MOODLE_29_STABLE
moodle · Mar 15, 2016 · 3648a75 · 3648a75
2 parents 627cfe2 + 2e735a1
commit 3648a75
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/admin/settings/server.php b/admin/settings/server.php
@@ -18,11 +18,10 @@
 
 // "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;