Merge branch 'MDL-57385-32-2' of git://github.com/junpataleta/moodle into MOODLE_32_STABLE

This commit is contained in:
David Monllao
2017-01-10 05:27:11 +01:00
4 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -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');
+1 -1
View File
@@ -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();
-1
View File
@@ -91,7 +91,6 @@ if ($context->contextlevel == CONTEXT_COURSE) {
print_error('notyourinstances', 'repository');
}
$user = $USER;
$PAGE->set_pagelayout('mydashboard');
} else {
print_error('invalidcontext');
}
+1 -1
View File
@@ -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;