From 8b57a2f6af9b779189640033d3cf20945be4cf63 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Sun, 6 Aug 2023 19:59:08 +0200
Subject: [PATCH] Merge branch
 'fix-ngonchanges-not-working-for-themed-components_contribute-7.2' into
 fix-ngonchanges-not-working-for-themed-components_contribute-7.4

# Conflicts:
#	src/app/app.component.ts
---
 src/app/shared/theme-support/theme.service.ts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts
index 762aece729..4ce976dd58 100644
--- a/src/app/shared/theme-support/theme.service.ts
+++ b/src/app/shared/theme-support/theme.service.ts
@@ -240,14 +240,7 @@ export class ThemeService {
       if (hasValue(parentThemeName)) {
         // inherit the head tags of the parent theme
         return this.createHeadTags(parentThemeName);
-      }
-      const defaultThemeConfig = getDefaultThemeConfig();
-      const defaultThemeName = defaultThemeConfig.name;
-      if (
-        hasNoValue(defaultThemeName) ||
-        themeName === defaultThemeName ||
-        themeName === BASE_THEME_NAME
-      ) {
+      } else {
         // last resort, use fallback favicon.ico
         return [
           this.createHeadTag({
@@ -260,9 +253,6 @@ export class ThemeService {
           })
         ];
       }
-
-      // inherit the head tags of the default theme
-      return this.createHeadTags(defaultThemeName);
     }
 
     return headTagConfigs.map(this.createHeadTag.bind(this));