Merge remote-tracking branch 'upstream/dev' into dev

2025-06-13 19:55:43 +02:00
parent a1011ed709 b1a8c28283
commit 413df647d3
3 changed files with 29 additions and 9 deletions
--- a/Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/CookieConsent.razor
@@ -103,6 +103,9 @@
    {
        var cookieConsentSetting = SettingService.GetSetting(PageState.Site.Settings, "CookieConsent", string.Empty);
        _enabled = !string.IsNullOrEmpty(cookieConsentSetting);
+
+        if (!_enabled) return;
+
        _optout = cookieConsentSetting == "optout";
        _actioned = await CookieConsentService.IsActionedAsync();

@@ -164,4 +167,4 @@
            StateHasChanged();
        }
    }
-}
+}