diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a90cd262..aae80215 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,7 @@ pool: variables: buildConfiguration: 'Release' - version: 2.41 + version: 2.42 steps: - task: UseDotNet@2 diff --git a/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs b/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs index 551346ea..4a501ac7 100644 --- a/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs +++ b/source/DasBlog.Services/ConfigFile/Interfaces/ISiteConfig.cs @@ -350,8 +350,6 @@ public interface ISiteConfig bool CookieConsentEnabled { get; set; } - bool EnableDoubleDecode { get; set; } - [XmlAnyElement] XmlElement[] anyElements { get; set; } diff --git a/source/DasBlog.Services/ConfigFile/SiteConfig.cs b/source/DasBlog.Services/ConfigFile/SiteConfig.cs index 5100ed91..30036e4c 100644 --- a/source/DasBlog.Services/ConfigFile/SiteConfig.cs +++ b/source/DasBlog.Services/ConfigFile/SiteConfig.cs @@ -217,7 +217,5 @@ public SiteConfig() { } public string SecurityStyleSources { get; set; } public string DefaultSources { get; set; } - - public bool EnableDoubleDecode { get; set; } } } diff --git a/source/DasBlog.Services/DasBlog.Services.csproj b/source/DasBlog.Services/DasBlog.Services.csproj index 80a9f230..1bec9e50 100644 --- a/source/DasBlog.Services/DasBlog.Services.csproj +++ b/source/DasBlog.Services/DasBlog.Services.csproj @@ -2,7 +2,7 @@ netcoreapp3.1 - 3.0.0 + 3.1.0 diff --git a/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs b/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs index 05a3e262..51d10b79 100644 --- a/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs +++ b/source/DasBlog.Tests/UnitTests/SiteConfigTest.cs @@ -165,7 +165,6 @@ public class SiteConfigTest : ISiteConfig public string SecurityScriptSources { get; set; } public string SecurityStyleSources { get; set; } - public bool EnableDoubleDecode { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } public string DefaultSources { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } } } diff --git a/source/DasBlog.Web.UI/Config/site.Development.config b/source/DasBlog.Web.UI/Config/site.Development.config index 9cd892d9..5bb30b86 100644 --- a/source/DasBlog.Web.UI/Config/site.Development.config +++ b/source/DasBlog.Web.UI/Config/site.Development.config @@ -113,8 +113,6 @@ cloud.tinymce.com;cdn.tiny.cloud;cdn.jsdelivr.net;js.nicedit.com;www.google.com;platform.twitter.com;cdn.syndication.twimg.com;fonts.googleapis.com;maxcdn.bootstrapcdn.com cloud.tinymce.com;cdn.tiny.cloud;cdn.jsdelivr.net;js.nicedit.com;www.google.com;cse.google.com;cdn.syndication.twimg.com;platform.twitter.com;apis.google.com;www.google-analytics.com;www.googletagservices.com;adservice.google.com;securepubads.g.doubleclick.net;ajax.aspnetcdn.com;ssl.google-analytics.com - false - true diff --git a/source/DasBlog.Web.UI/Config/site.config b/source/DasBlog.Web.UI/Config/site.config index 4e2cc448..d4dac00e 100644 --- a/source/DasBlog.Web.UI/Config/site.config +++ b/source/DasBlog.Web.UI/Config/site.config @@ -116,8 +116,6 @@ cloud.tinymce.com;cdn.tiny.cloud;cdn.jsdelivr.net;js.nicedit.com;www.google.com;platform.twitter.com;cdn.syndication.twimg.com;fonts.googleapis.com;maxcdn.bootstrapcdn.com cloud.tinymce.com;cdn.tiny.cloud;cdn.jsdelivr.net;js.nicedit.com;www.google.com;cse.google.com;cdn.syndication.twimg.com;platform.twitter.com;apis.google.com;www.google-analytics.com;www.googletagservices.com;adservice.google.com;securepubads.g.doubleclick.net;ajax.aspnetcdn.com;ssl.google-analytics.com - false - true diff --git a/source/DasBlog.Web.UI/DasBlog.Web.csproj b/source/DasBlog.Web.UI/DasBlog.Web.csproj index 103b3530..7b55388e 100644 --- a/source/DasBlog.Web.UI/DasBlog.Web.csproj +++ b/source/DasBlog.Web.UI/DasBlog.Web.csproj @@ -14,7 +14,7 @@ true Linux d3583964-0aca-4de4-9521-c74cdf42f990 - 2.41.0 + 2.42.0 diff --git a/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs b/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs index 4fab60dd..7544cace 100644 --- a/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs +++ b/source/DasBlog.Web.UI/Models/AdminViewModels/SiteViewModel.cs @@ -282,10 +282,6 @@ public class SiteViewModel [Description("Help meet some of the EU General Data Protection Regulation (GDPR) requirements")] public bool CookieConsentEnabled { get; set; } - [DisplayName("Double decode")] - [Description("")] - public bool EnableDoubleDecode { get; set; } - [DisplayName("Default Sources (seperated by semi colon")] [Description("")] [StringLength(50, MinimumLength = 1, ErrorMessage = "{0} should be between 1 to 50 characters")] diff --git a/source/DasBlog.Web.UI/TagHelpers/Post/PostContentTagHelper.cs b/source/DasBlog.Web.UI/TagHelpers/Post/PostContentTagHelper.cs index 21c09dab..df5bde99 100644 --- a/source/DasBlog.Web.UI/TagHelpers/Post/PostContentTagHelper.cs +++ b/source/DasBlog.Web.UI/TagHelpers/Post/PostContentTagHelper.cs @@ -24,12 +24,7 @@ public PostContentTagHelper(IDasBlogSettings dasBlogSettings) public override void Process(TagHelperContext context, TagHelperOutput output) { - var content = Post.Content; - - if(dasBlogSettings.SiteConfiguration.EnableDoubleDecode) - { - content = HttpUtility.HtmlDecode(Post.Content); - } + var content = HttpUtility.HtmlDecode(Post.Content); output.TagName = "div"; output.TagMode = TagMode.StartTagAndEndTag; diff --git a/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml b/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml index c66dc9ad..740c4bbe 100644 --- a/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml +++ b/source/DasBlog.Web.UI/Views/Admin/Settings.cshtml @@ -490,13 +490,6 @@ -
- - @Html.LabelFor(m => @Model.SiteConfig.EnableDoubleDecode, null, new { @class = "dbc-col-form-label col-3" }) - @Html.CheckBoxFor(m => @Model.SiteConfig.EnableDoubleDecode, new { @class = "dbc-form-check-input" }) - -
-

Internal