From 2eec6ffc6ca4c2c069e933f6dad92cba952e1164 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Tue, 6 Dec 2016 16:44:40 +0800
Subject: [PATCH] MDL-57385 core: Set page layouts of non-mydashboard pages to
 standard

The following pages are using the "mydashboard" page layout:
* User preferences > Badges > Manage badges
* User preferences > Badges > Backpack settings
* User preferences > Repositories > Manage instances
* Private files
However, the "mydashboard" page layout should only be used for the user's
dashboard page. Changing these to use the "standard" page layout.
---
 badges/mybackpack.php           | 2 +-
 badges/mybadges.php             | 2 +-
 repository/manage_instances.php | 1 -
 user/files.php                  | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/badges/mybackpack.php b/badges/mybackpack.php
index d9baedd7caf..7343d92aa90 100644
--- a/badges/mybackpack.php
+++ b/badges/mybackpack.php
@@ -50,7 +50,7 @@ $PAGE->set_context($context);
 $title = get_string('backpackdetails', 'badges');
 $PAGE->set_title($title);
 $PAGE->set_heading(fullname($USER));
-$PAGE->set_pagelayout('mydashboard');
+$PAGE->set_pagelayout('standard');
 
 $backpack = $DB->get_record('badge_backpack', array('userid' => $USER->id));
 $badgescache = cache::make('core', 'externalbadges');
diff --git a/badges/mybadges.php b/badges/mybadges.php
index 0ef4f68046d..8437ad46e6a 100644
--- a/badges/mybadges.php
+++ b/badges/mybadges.php
@@ -89,7 +89,7 @@ $PAGE->set_context($context);
 $title = get_string('badges', 'badges');
 $PAGE->set_title($title);
 $PAGE->set_heading(fullname($USER));
-$PAGE->set_pagelayout('mydashboard');
+$PAGE->set_pagelayout('standard');
 
 // Include JS files for backpack support.
 badges_setup_backpack_js();
diff --git a/repository/manage_instances.php b/repository/manage_instances.php
index bd1f62bb916..172d050f6ae 100644
--- a/repository/manage_instances.php
+++ b/repository/manage_instances.php
@@ -91,7 +91,6 @@ if ($context->contextlevel == CONTEXT_COURSE) {
         print_error('notyourinstances', 'repository');
     }
     $user = $USER;
-    $PAGE->set_pagelayout('mydashboard');
 } else {
     print_error('invalidcontext');
 }
diff --git a/user/files.php b/user/files.php
index 5ff6f84754a..32c99f4f244 100644
--- a/user/files.php
+++ b/user/files.php
@@ -48,7 +48,7 @@ $PAGE->set_url('/user/files.php');
 $PAGE->set_context($context);
 $PAGE->set_title($title);
 $PAGE->set_heading(fullname($USER));
-$PAGE->set_pagelayout('mydashboard');
+$PAGE->set_pagelayout('standard');
 $PAGE->set_pagetype('user-files');
 
 $maxbytes = $CFG->userquota;