mirror of
https://github.com/moodle/moodle.git
synced 2025-08-06 01:16:44 +02:00
Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle
This commit is contained in:
commit
a9bd004c8c
2 changed files with 2 additions and 1 deletions
|
@ -2550,6 +2550,7 @@ function redirect($url, $message='', $delay=-1) {
|
||||||
if ($PAGE) {
|
if ($PAGE) {
|
||||||
$PAGE->set_context(null);
|
$PAGE->set_context(null);
|
||||||
$PAGE->set_pagelayout('redirect'); // No header and footer needed.
|
$PAGE->set_pagelayout('redirect'); // No header and footer needed.
|
||||||
|
$PAGE->set_title(get_string('pageshouldredirect', 'moodle'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($url instanceof moodle_url) {
|
if ($url instanceof moodle_url) {
|
||||||
|
|
|
@ -790,7 +790,7 @@ if ($fromform = $mform_post->get_data()) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($subscribemessage = forum_post_subscription($discussion, $forum)) {
|
if ($subscribemessage = forum_post_subscription($discussion, $forum)) {
|
||||||
$timemessage = 4;
|
$timemessage = 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update completion status
|
// Update completion status
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue