From 585f6696419df14912da7bf27b619289fdd3bd78 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 2 Jun 2022 16:10:31 +0200
Subject: [PATCH] MOBILE-4089 forum: Fix infinite loop in getDiscussionsInPages

---
 src/addons/mod/forum/services/forum.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/addons/mod/forum/services/forum.ts b/src/addons/mod/forum/services/forum.ts
index 9c2e1c989..adf94722f 100644
--- a/src/addons/mod/forum/services/forum.ts
+++ b/src/addons/mod/forum/services/forum.ts
@@ -845,8 +845,6 @@ export class AddonModForumProvider {
         forumId: number,
         options: AddonModForumGetDiscussionsInPagesOptions = {},
     ): Promise<{ discussions: AddonModForumDiscussion[]; error: boolean }> {
-        options.page = options.page || 0;
-
         const result = {
             discussions: [] as AddonModForumDiscussion[],
             error: false,
@@ -859,7 +857,10 @@ export class AddonModForumProvider {
 
         const getPage = (page: number): Promise<{ discussions: AddonModForumDiscussion[]; error: boolean }> =>
             // Get page discussions.
-            this.getDiscussions(forumId, options).then((response) => {
+            this.getDiscussions(forumId, {
+                ...options,
+                page,
+            }).then((response) => {
                 result.discussions = result.discussions.concat(response.discussions);
                 numPages--;
 
@@ -876,7 +877,7 @@ export class AddonModForumProvider {
             })
         ;
 
-        return getPage(options.page);
+        return getPage(options.page ?? 0);
     }
 
     /**