MDL-81287 mod_forum: observe default discussion paging value.

AnupamaSarjoshi · May 15, 2024 · dfde819 · dfde819
1 parent 477aa7c
commit dfde819
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mod/forum/classes/local/renderers/discussion_list.php b/mod/forum/classes/local/renderers/discussion_list.php
@@ -230,7 +230,7 @@ public function render(
             $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,

diff --git a/mod/forum/view.php b/mod/forum/view.php
@@ -41,7 +41,7 @@
 $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) {