Merge remote-tracking branch 'origin/v8/dev' into netcore/dev

# Conflicts: # src/SolutionInfo.cs
2019-11-07 14:34:45 +01:00
parent 40ca1fd27a d747312eb7
commit 563f58afa6
35 changed files with 2682 additions and 2410 deletions
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -3083,7 +3083,7 @@ namespace Umbraco.Core.Services.Implement
            var version = GetVersion(versionId);

            //Good ole null checks
-            if (content == null || version == null)
+            if (content == null || version == null || content.Trashed)
            {
                return new OperationResult(OperationResultType.FailedCannot, evtMsgs);
            }