From 83419a30ea7a07bee3d417196ed95e4a96bd789a Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <niko737@edu.ucl.dk>
Date: Fri, 22 Apr 2022 12:37:20 +0200
Subject: [PATCH] Fix build errors after merging

---
 .../Models/Mapping/MemberTabsAndPropertiesMapper.cs           | 2 +-
 src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs b/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
index 78506e6ba6..d6d3453a26 100644
--- a/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
+++ b/src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
@@ -277,7 +277,7 @@ namespace Umbraco.Cms.Core.Models.Mapping
                 },
             };
 
-            if (_backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.HasAccessToSensitiveData() is false)
+            if (_backofficeSecurityAccessor.BackOfficeSecurity?.CurrentUser?.HasAccessToSensitiveData() is false)
             {
                 // Current user doesn't have access to sensitive data so explicitly set the views and remove the value from sensitive data
                 foreach (var property in properties)
diff --git a/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs b/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
index ea77708c8c..5a0088c727 100644
--- a/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
+++ b/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
@@ -412,7 +412,7 @@ namespace Umbraco.Extensions
         /// <param name="nestedSelect">The nested sql query.</param>
         /// <param name="alias">An optional alias for the joined table.</param>
         /// <returns>A SqlJoin statement.</returns>
-        public static Sql<ISqlContext>.SqlJoinClause<ISqlContext> InnerJoin(this Sql<ISqlContext> sql, Sql<ISqlContext> nestedSelect, string alias = null)
+        public static Sql<ISqlContext>.SqlJoinClause<ISqlContext> InnerJoin(this Sql<ISqlContext> sql, Sql<ISqlContext> nestedSelect, string? alias = null)
         {
             var join = $"({nestedSelect.SQL})";
             if (alias is not null)
@@ -462,7 +462,7 @@ namespace Umbraco.Extensions
         /// <param name="nestedSelect">The nested sql query.</param>
         /// <param name="alias">An optional alias for the joined table.</param>
         /// <returns>A SqlJoin statement.</returns>
-        public static Sql<ISqlContext>.SqlJoinClause<ISqlContext> LeftJoin(this Sql<ISqlContext> sql, Sql<ISqlContext> nestedSelect, string alias = null)
+        public static Sql<ISqlContext>.SqlJoinClause<ISqlContext> LeftJoin(this Sql<ISqlContext> sql, Sql<ISqlContext> nestedSelect, string? alias = null)
         {
             var join = $"({nestedSelect.SQL})";
             if (alias is not null)