Merge branch 'MDL-53234-support-email-MOODLE_30_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_30_STABLE

2016-03-15 13:43:51 +08:00
parent 222ada1726 73e281cdc4
commit 2941895cda
1 changed files with 4 additions and 5 deletions
@@ -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;