From 57532fd393fc5c9f763fbec6b2a8d4c3a70c9159 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Wed, 17 Nov 2021 13:06:55 +0100
Subject: [PATCH] MOBILE-3833 user: Fix handler cache clear

---
 src/core/features/user/services/user-delegate.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/features/user/services/user-delegate.ts b/src/core/features/user/services/user-delegate.ts
index b16a36787..df503bc7d 100644
--- a/src/core/features/user/services/user-delegate.ts
+++ b/src/core/features/user/services/user-delegate.ts
@@ -397,8 +397,14 @@ export class CoreUserDelegateService extends CoreDelegate<CoreUserProfileHandler
      */
     protected clearHandlerCache(courseId?: number, userId?: number): void {
         if (courseId && userId) {
+            const cacheKey = this.getCacheKey(courseId, userId);
+
             Object.keys(this.enabledHandlers).forEach((name) => {
-                delete this.enabledForUserCache[name][this.getCacheKey(courseId, userId)];
+                const cache = this.enabledForUserCache[name];
+
+                if (cache) {
+                    delete cache[cacheKey];
+                }
             });
         } else {
             this.enabledForUserCache = {};