yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2996 added GlobalSettings.DebugMode switch for JSON formatting indentation.

Browse Source
This commit is contained in:
Benjamin Howarth
2019-09-24 17:25:10 +01:00
committed by Sebastiaan Janssen
parent 18cd508804
commit d3c4aace16
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Serialization/JsonNetSerializer.cs
View File

@@ -4,6 +4,7 @@ using System.Reflection;
using System.Text;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Umbraco.Core.Configuration;
namespace Umbraco.Core.Serialization
{
@@ -60,7 +61,8 @@ namespace Umbraco.Core.Serialization
/// <returns></returns>
public IStreamedResult ToStream(object input)
{
string s = JsonConvert.SerializeObject(input, Formatting.Indented, _settings);
var formatting = GlobalSettings.DebugMode ? Formatting.Indented : Formatting.None;
string s = JsonConvert.SerializeObject(input, formatting, _settings);
byte[] bytes = Encoding.UTF8.GetBytes(s);
MemoryStream ms = new MemoryStream(bytes);
@@ -69,4 +71,4 @@ namespace Umbraco.Core.Serialization
#endregion
}
}
}