Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into t…

…emp8
umbraco · Feb 13, 2019 · 0a4502a · 0a4502a
2 parents 0176e2f + ac44823
commit 0a4502a
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
@@ -464,6 +464,16 @@ public PagedResult<ContentItemBasic<ContentPropertyBasic>> GetChildren(
         {
             long totalChildren;
             List<IContent> children;
+
+            // Sets the culture to the only existing culture if we only have one culture.
+            if (string.IsNullOrWhiteSpace(cultureName))
+            {
+                if (_allLangs.Value.Count == 1)
+                {
+                    cultureName = _allLangs.Value.First().Key;
+                }
+            }
+
             if (pageNumber > 0 && pageSize > 0)
             {
                 IQuery<IContent> queryFilter = null;
@@ -1200,7 +1210,7 @@ private PublishResult PublishInternal(ContentItemSave contentItem, out bool wasC
             if (canPublish)
             {
                 var culturesToPublish = cultureVariants.Where(x => x.Publish).Select(x => x.Culture).ToArray();
-                
+
                 //proceed to publish if all validation still succeeds
                 var publishStatus = Services.ContentService.SaveAndPublish(contentItem.PersistedContent, culturesToPublish, Security.CurrentUser.Id);
                 wasCancelled = publishStatus.Result == PublishResultType.FailedPublishCancelledByEvent;