MDL-36379 user_view: fixed issue with page layout when editing was on

diff --git a/user/view.php b/user/view.php
index 4c4c8da..c5aa4a2 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -148,9 +148,12 @@ if ($currentuser) {
     }
 }
 
     }
 }
 

+$PAGE->set_title("$course->fullname: $strpersonalprofile: $fullname");
+$PAGE->set_heading($course->fullname);
+$PAGE->set_pagelayout('standard');

 
 

-/// We've established they can see the user's name at least, so what about the rest?
-
+// Locate the users settings in the settings navigation and force it open.
+// This MUST be done after we've set up the page as it is going to cause theme and output to initialise.

 if (!$currentuser) {
     $PAGE->navigation->extend_for_user($user);
     if ($node = $PAGE->settingsnav->get('userviewingsettings'.$user->id)) {
 if (!$currentuser) {
     $PAGE->navigation->extend_for_user($user);
     if ($node = $PAGE->settingsnav->get('userviewingsettings'.$user->id)) {


@@ -163,9 +166,6 @@ if ($node = $PAGE->settingsnav->get('courseadmin')) {
     $node->forceopen = false;
 }
 
     $node->forceopen = false;
 }
 

-$PAGE->set_title("$course->fullname: $strpersonalprofile: $fullname");
-$PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('standard');

 echo $OUTPUT->header();
 
 echo '<div class="userprofile">';
 echo $OUTPUT->header();
 
 echo '<div class="userprofile">';