yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build errors after merging

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-04-22 12:37:20 +02:00
parent 70a75d8c9b
commit 83419a30ea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/Mapping/MemberTabsAndPropertiesMapper.cs
View File

@@ -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)

4
src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
View File

@@ -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)