Merge branch 'v7/dev' into v8/dev

# Conflicts: # src/Umbraco.Core/Serialization/JsonNetSerializer.cs # src/Umbraco.Web/Editors/BackOfficeController.cs
umbraco · Sep 26, 2019 · 5831cd9 · 5831cd9
2 parents 4904060 + 16837d0
commit 5831cd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Umbraco.Core/Serialization/JsonNetSerializer.cs b/src/Umbraco.Core/Serialization/JsonNetSerializer.cs
@@ -60,7 +60,7 @@ public object FromStream(Stream input, Type outputType)
         /// <returns></returns>
         public IStreamedResult ToStream(object input)
         {
-            string s = JsonConvert.SerializeObject(input, Formatting.Indented, _settings);
+            string s = JsonConvert.SerializeObject(input, Formatting.None, _settings);
             byte[] bytes = Encoding.UTF8.GetBytes(s);
             MemoryStream ms = new MemoryStream(bytes);
 

diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -189,7 +189,7 @@ public JsonNetResult LocalizedText(string culture = null)
                 .ToDictionary(pv => pv.Key, pv =>
                     pv.ToDictionary(pve => pve.valueAlias, pve => pve.value));
 
-            return new JsonNetResult { Data = nestedDictionary, Formatting = Formatting.Indented };
+            return new JsonNetResult { Data = nestedDictionary, Formatting = Formatting.None };
         }
 
         /// <summary>
@@ -236,15 +236,15 @@ JArray GetAssetList()
                     GetAssetList,
                     new TimeSpan(0, 2, 0));
 
-            return new JsonNetResult { Data = result, Formatting = Formatting.Indented };
+            return new JsonNetResult { Data = result, Formatting = Formatting.None };
         }
 
         [UmbracoAuthorize(Order = 0)]
         [HttpGet]
         public JsonNetResult GetGridConfig()
         {
             var gridConfig = Current.Configs.Grids();
-            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.Indented };
+            return new JsonNetResult { Data = gridConfig.EditorsConfig.Editors, Formatting = Formatting.None };
         }