Merge branch 'v8/8.17' into v9/feature/merge_v8.17-rc

2021-09-07 12:10:58 +02:00
parent e31dad6552 05d0a29e03
commit ee2da5b8ca
335 changed files with 9119 additions and 2275 deletions
--- a/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs
@@ -251,7 +251,7 @@ namespace Umbraco.Cms.Web.BackOffice.Trees
            var culture = queryStrings["culture"].TryConvertTo<string>();

            //if this is null we'll set it to the default.
-            var cultureVal = (culture.Success ? culture.Result : null) ?? _localizationService.GetDefaultLanguageIsoCode();
+            var cultureVal = (culture.Success ? culture.Result : null).IfNullOrWhiteSpace(_localizationService.GetDefaultLanguageIsoCode());

            // set names according to variations
            foreach (var entity in result.Value)