Merge pull request #6056 from sbwalker/dev
support html encoded content
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Oqtane.Models;
|
using Oqtane.Models;
|
||||||
@@ -123,9 +124,9 @@ namespace Oqtane.Infrastructure
|
|||||||
{
|
{
|
||||||
var moduleObject = ActivatorUtilities.CreateInstance(provider, moduleType);
|
var moduleObject = ActivatorUtilities.CreateInstance(provider, moduleType);
|
||||||
var moduleContent = ((IPortable)moduleObject).ExportModule(pageModule.Module);
|
var moduleContent = ((IPortable)moduleObject).ExportModule(pageModule.Module);
|
||||||
if (!string.IsNullOrEmpty(moduleContent) && moduleContent.Contains(find, comparisonType) && globalReplace.Content)
|
if (!string.IsNullOrEmpty(moduleContent) && moduleContent.Contains(WebUtility.HtmlEncode(find), comparisonType) && globalReplace.Content)
|
||||||
{
|
{
|
||||||
moduleContent = moduleContent.Replace(find, replace, comparisonType);
|
moduleContent = moduleContent.Replace(WebUtility.HtmlEncode(find), WebUtility.HtmlEncode(replace), comparisonType);
|
||||||
((IPortable)moduleObject).ImportModule(pageModule.Module, moduleContent, pageModule.Module.ModuleDefinition.Version);
|
((IPortable)moduleObject).ImportModule(pageModule.Module, moduleContent, pageModule.Module.ModuleDefinition.Version);
|
||||||
log += $"Module Content Updated: {pageModule.Title} Page: /{page.Path}<br />";
|
log += $"Module Content Updated: {pageModule.Title} Page: /{page.Path}<br />";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user