Skip to content

Commit a7bef6f

Browse files
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
2 parents ea677bd + e4b386b commit a7bef6f

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

src/app/shared/theme-support/theme.service.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,7 @@ export class ThemeService {
240240
if (hasValue(parentThemeName)) {
241241
// inherit the head tags of the parent theme
242242
return this.createHeadTags(parentThemeName);
243-
}
244-
const defaultThemeConfig = getDefaultThemeConfig();
245-
const defaultThemeName = defaultThemeConfig.name;
246-
if (
247-
hasNoValue(defaultThemeName) ||
248-
themeName === defaultThemeName ||
249-
themeName === BASE_THEME_NAME
250-
) {
243+
} else {
251244
// last resort, use fallback favicon.ico
252245
return [
253246
this.createHeadTag({
@@ -260,9 +253,6 @@ export class ThemeService {
260253
})
261254
];
262255
}
263-
264-
// inherit the head tags of the default theme
265-
return this.createHeadTags(defaultThemeName);
266256
}
267257

268258
return headTagConfigs.map(this.createHeadTag.bind(this));

0 commit comments

Comments
 (0)