Skip to content

Commit 7e55de1

Browse files
Fix Null Exception with filters (#17407)
Co-authored-by: Mike Alhayek <[email protected]>
1 parent 1e667d2 commit 7e55de1

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
3939
{
4040
var settings = await _siteService.GetSettingsAsync<FacebookPixelSettings>();
4141

42-
if (settings is not null)
42+
if (!string.IsNullOrEmpty(settings?.PixelId))
4343
{
4444
_resourceManager.RegisterHeadScript(new HtmlContentBuilder([_preamble, _jsEncoder.Encode(settings.PixelId), _end]));
4545
}

src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
4343
{
4444
var settings = await _siteService.GetSettingsAsync<GoogleAnalyticsSettings>();
4545

46-
if (settings is not null)
46+
if (!string.IsNullOrEmpty(settings?.TrackingID))
4747
{
4848
_resourceManager.RegisterHeadScript(new HtmlContentBuilder([_preamble, _urlEncoder.Encode(settings.TrackingID), _middle, _jsEncoder.Encode(settings.TrackingID), _end]));
4949
}

src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public sealed class GoogleTagManagerFilter : IAsyncResultFilter
1616
private readonly JavaScriptEncoder _jsEncoder;
1717

1818
private static readonly HtmlString _preamble = new("<!-- Google Tag Manager -->\n<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':\n new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],\n j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=\n 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);\n })(window,document,'script','dataLayer','");
19-
private static readonly HtmlString _end= new HtmlString("');</script>\n<!-- End Google Tag Manager -->");
19+
private static readonly HtmlString _end = new HtmlString("');</script>\n<!-- End Google Tag Manager -->");
2020

2121
public GoogleTagManagerFilter(
2222
IResourceManager resourceManager,
@@ -39,7 +39,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE
3939
{
4040
var settings = await _siteService.GetSettingsAsync<GoogleTagManagerSettings>();
4141

42-
if (settings is not null)
42+
if (!string.IsNullOrEmpty(settings?.ContainerID))
4343
{
4444
_resourceManager.RegisterHeadScript(new HtmlContentBuilder([_preamble, _jsEncoder.Encode(settings.ContainerID), _end]));
4545
}

0 commit comments

Comments
 (0)