mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 14:27:22 +01:00
Merge branch 'MDL-81287' of https://github.com/paulholden/moodle
This commit is contained in:
commit
409a36265e
@ -230,7 +230,7 @@ class discussion_list {
|
||||
$exportedposts = ($this->postprocessfortemplate) ($discussions, $user, $forum);
|
||||
}
|
||||
|
||||
$baseurl = new \moodle_url($PAGE->url, array('o' => $sortorder));
|
||||
$baseurl = new \moodle_url($PAGE->url, ['o' => $sortorder, 's' => $pagesize]);
|
||||
|
||||
$forumview = array_merge(
|
||||
$forumview,
|
||||
|
@ -41,7 +41,7 @@ $showall = optional_param('showall', '', PARAM_INT);
|
||||
$pageno = optional_param('page', 0, PARAM_INT);
|
||||
$search = optional_param('search', '', PARAM_CLEAN);
|
||||
$pageno = optional_param('p', $pageno, PARAM_INT);
|
||||
$pagesize = optional_param('s', 0, PARAM_INT);
|
||||
$pagesize = optional_param('s', $CFG->forum_manydiscussions ?? 0, PARAM_INT);
|
||||
$sortorder = optional_param('o', null, PARAM_INT);
|
||||
|
||||
if (!$cmid && !$forumid) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user