themes: MDL-19077 - Incorrect initialisation order for user/editadvanced.php

diff --git a/user/editadvanced.php b/user/editadvanced.php
index b62d5dcebc084eaa0a34460b5d938867fff77f3e..41e867f5e08334e2da886ad0ff2d8cadf7e076d7 100644 (file)
--- a/user/editadvanced.php
+++ b/user/editadvanced.php
@@ -66,6 +66,12 @@
         die;
     }
 
+    if ($user->id == -1) {
+        admin_externalpage_setup('addnewuser', '', array('id' => -1));
+    } else if ($user->id != $USER->id) {
+        admin_externalpage_setup('editusers', '', array('id' => $user->id, 'course' => SITEID), $CFG->wwwroot . '/user/editadvanced.php');
+    }
+
     //load user preferences
     useredit_load_preferences($user);
 
@@ -188,10 +194,8 @@
 /// Display page header
     if ($user->id == -1 or ($user->id != $USER->id)) {
         if ($user->id == -1) {
-            admin_externalpage_setup('addnewuser', '', array('id' => -1));
             admin_externalpage_print_header();
         } else {
-            admin_externalpage_setup('editusers', '', array('id' => $user->id, 'course' => SITEID), $CFG->wwwroot . '/user/editadvanced.php');
             admin_externalpage_print_header();
             $userfullname = fullname($user, true);
             print_heading($userfullname);