Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2018-06-19 01:49:05 +02:00
commit eeb0597493

View File

@ -350,7 +350,7 @@ if (!empty($forum)) { // User is starting a new discussion in a forum
$event->add_record_snapshot('forum_discussions', $discussion);
$event->trigger();
redirect("view.php?f=$discussion->forum");
redirect(new moodle_url('/mod/forum/view.php', ['f' => $discussion->forum]));
} else if (forum_delete_post($post, has_capability('mod/forum:deleteanypost', $modcontext),
$course, $cm, $forum)) {
@ -845,7 +845,7 @@ if ($mform_post->is_cancelled()) {
} else { // Adding a new discussion.
// The location to redirect to after successfully posting.
$redirectto = new moodle_url('view.php', array('f' => $fromform->forum));
$redirectto = new moodle_url('/mod/forum/view.php', array('f' => $fromform->forum));
$fromform->mailnow = empty($fromform->mailnow) ? 0 : 1;