From a0f1a808c7976c52e15921cce7548325acc90420 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 11 May 2023 16:13:42 +0200
Subject: [PATCH 1/2] MOBILE-4270 forum: Fix pinned & starred discussion

---
 src/addons/mod/forum/components/index/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/addons/mod/forum/components/index/index.html b/src/addons/mod/forum/components/index/index.html
index 62bffc7ff..9d9fb1bcf 100644
--- a/src/addons/mod/forum/components/index/index.html
+++ b/src/addons/mod/forum/components/index/index.html
@@ -80,7 +80,7 @@
                     <p class="addon-mod-forum-discussion-title ion-text-wrap item-heading">
                         <ion-icon name="fas-map-pin" *ngIf="discussion.pinned"
                             [attr.aria-label]="'addon.mod_forum.discussionpinned' | translate"></ion-icon>
-                        <ion-icon name="fas-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"
+                        <ion-icon name="fas-star" class="addon-forum-star" *ngIf="discussion.starred"
                             [attr.aria-label]="'addon.mod_forum.favourites' | translate"></ion-icon>
                         <core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module && module.id"
                             [courseId]="courseId">

From c03f656af15f5fc583426c1b2c3e88be5c386c22 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Thu, 11 May 2023 17:25:48 +0200
Subject: [PATCH 2/2] MOBILE-4270 glossary: Fix link handler

---
 src/addons/mod/glossary/glossary.module.ts             |  6 ++++++
 .../mod/glossary/services/handlers/entry-link.ts       | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/addons/mod/glossary/glossary.module.ts b/src/addons/mod/glossary/glossary.module.ts
index da86adf1c..a4cd4457d 100644
--- a/src/addons/mod/glossary/glossary.module.ts
+++ b/src/addons/mod/glossary/glossary.module.ts
@@ -49,6 +49,12 @@ export const ADDON_MOD_GLOSSARY_SERVICES: Type<unknown>[] = [
 ];
 
 const mainMenuRoutes: Routes = [
+    // Link handlers navigation.
+    {
+        path: `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/entry/:entrySlug`,
+        loadChildren: () => import('./glossary-entry-lazy.module').then(m => m.AddonModGlossaryEntryLazyModule),
+    },
+
     // Course activity navigation.
     {
         path: AddonModGlossaryModuleHandlerService.PAGE_NAME,
diff --git a/src/addons/mod/glossary/services/handlers/entry-link.ts b/src/addons/mod/glossary/services/handlers/entry-link.ts
index 2402b7f53..7907c4d8b 100644
--- a/src/addons/mod/glossary/services/handlers/entry-link.ts
+++ b/src/addons/mod/glossary/services/handlers/entry-link.ts
@@ -56,8 +56,14 @@ export class AddonModGlossaryEntryLinkHandlerService extends CoreContentLinksHan
                     );
 
                     await CoreNavigator.navigateToSitePath(
-                        AddonModGlossaryModuleHandlerService.PAGE_NAME + `/${module.course}/${module.id}/entry/${entryId}`,
-                        { siteId },
+                        `${AddonModGlossaryModuleHandlerService.PAGE_NAME}/entry/${entryId}`,
+                        {
+                            siteId,
+                            params: {
+                                courseId: module.course,
+                                cmId: module.id,
+                            },
+                        },
                     );
                 } catch (error) {
                     CoreDomUtils.showErrorModalDefault(error, 'addon.mod_glossary.errorloadingentry', true);