MDL-38369 repository: Remove output before redirect

This commit is contained in:
Frederic Massart
2013-05-20 10:25:34 +08:00
committed by Dan Poltawski
parent d8581a2367
commit b42e6e1c2e
+3 -3
View File
@@ -148,7 +148,6 @@ if (!empty($course)) {
// Display page header.
$PAGE->set_title($pagename);
$PAGE->set_heading($fullname);
echo $OUTPUT->header();
$return = true;
if (!empty($edit) || !empty($new)) {
@@ -189,13 +188,13 @@ if (!empty($edit) || !empty($new)) {
}
if ($success) {
$savedstr = get_string('configsaved', 'repository');
echo $OUTPUT->heading($savedstr);
redirect($baseurl);
} else {
print_error('instancenotsaved', 'repository', $baseurl);
}
exit;
} else { // Display the form
echo $OUTPUT->header();
echo $OUTPUT->heading(get_string('configplugin', 'repository_'.$plugin));
$OUTPUT->box_start();
$mform->display();
@@ -209,18 +208,19 @@ if (!empty($edit) || !empty($new)) {
}
if ($instance->delete()) {
$deletedstr = get_string('instancedeleted', 'repository');
echo $OUTPUT->heading($deletedstr);
redirect($baseurl, $deletedstr, 3);
} else {
print_error('instancenotdeleted', 'repository', $baseurl);
}
exit;
}
echo $OUTPUT->header();
$formcontinue = new single_button(new moodle_url($baseurl, array('delete' => $delete, 'sure' => 'yes')), get_string('yes'));
$formcancel = new single_button($baseurl, get_string('no'));
echo $OUTPUT->confirm(get_string('confirmdelete', 'repository', $instance->name), $formcontinue, $formcancel);
$return = false;
} else {
echo $OUTPUT->header();
repository::display_instances_list($context);
$return = false;
}