Skip to content

Commit 28756d4

Browse files
committed
Rectify v13 in v14 merge
1 parent 38a96db commit 28756d4

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

Directory.Packages.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,5 @@
8989
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
9090
<!-- Both OpenIddict.AspNetCore, Npoco.SqlServer and Microsoft.EntityFrameworkCore.SqlServer bring in a vulnerable version of Microsoft.IdentityModel.JsonWebTokens -->
9191
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.7.1" />
92-
93-
<!-- Both OpenIddict.AspNetCore, Microsoft.EntityFrameworkCore.* bring in a vulnerable version of Microsoft.Extensions.Caching.Memory -->
94-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
9592
</ItemGroup>
9693
</Project>

src/Umbraco.Core/Services/ContentService.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,8 +2484,6 @@ public OperationResult Move(IContent content, int parentId, int userId = Constan
24842484
scope.Complete();
24852485
return OperationResult.Succeed(eventMessages);
24862486
}
2487-
2488-
return OperationResult.Succeed(eventMessages);
24892487
}
24902488

24912489
// MUST be called from within WriteLock

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/AuditRepository.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public IEnumerable<IAuditItem> GetPagedResultsByQuery(
104104
totalRecords = page.TotalItems;
105105

106106
var items = page.Items.Select(
107-
dto => new AuditItem(dto.NodeId, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Datestamp, dto.Comment, dto.Parameters)).ToList();
107+
dto => new AuditItem(dto.NodeId, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Comment, dto.Parameters, dto.Datestamp)).ToList();
108108

109109
// map the DateStamp
110110
for (var i = 0; i < items.Count; i++)
@@ -149,7 +149,7 @@ protected override void PersistUpdatedItem(IAuditItem entity) =>
149149
LogDto? dto = Database.First<LogDto>(sql);
150150
return dto == null
151151
? null
152-
: new AuditItem(dto.NodeId, Enum<AuditType>.Parse(dto.Header), dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Datestamp, dto.Comment, dto.Parameters);
152+
: new AuditItem(dto.NodeId, Enum<AuditType>.Parse(dto.Header), dto.UserId ?? Constants.Security.UnknownUserId, dto.EntityType, dto.Comment, dto.Parameters, dto.Datestamp);
153153
}
154154

155155
protected override IEnumerable<IAuditItem> PerformGetAll(params int[]? ids) => throw new NotImplementedException();
@@ -162,7 +162,7 @@ protected override IEnumerable<IAuditItem> PerformGetByQuery(IQuery<IAuditItem>
162162

163163
List<LogDto>? dtos = Database.Fetch<LogDto>(sql);
164164

165-
return dtos.Select(x => new AuditItem(x.NodeId, Enum<AuditType>.Parse(x.Header), x.UserId ?? Constants.Security.UnknownUserId, x.EntityType, x.Datestamp, x.Comment, x.Parameters)).ToList();
165+
return dtos.Select(x => new AuditItem(x.NodeId, Enum<AuditType>.Parse(x.Header), x.UserId ?? Constants.Security.UnknownUserId, x.EntityType, x.Comment, x.Parameters, x.Datestamp)).ToList();
166166
}
167167

168168
protected override Sql<ISqlContext> GetBaseQuery(bool isCount)

0 commit comments

Comments
 (0)