diff --git a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs index 06a70a31722..4a25bda271a 100644 --- a/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs +++ b/DNN Platform/Library/Services/GeneratedImage/DnnImageHandler.cs @@ -17,6 +17,7 @@ namespace DotNetNuke.Services.GeneratedImage using System.Web; using DotNetNuke.Common; + using DotNetNuke.Common.Utilities; using DotNetNuke.Entities.Portals; using DotNetNuke.Services.FileSystem; using DotNetNuke.Services.GeneratedImage.FilterTransform; @@ -177,7 +178,11 @@ public override ImageInfo GenerateImage(NameValueCollection parameters) if (!string.IsNullOrEmpty(parameters["Text"])) { - placeHolderTrans.Text = text; + bool.TryParse(Config.GetSetting("AllowDnnImagePlaceholderText"), out bool allowDnnImagePlaceholderText); + if (allowDnnImagePlaceholderText) + { + placeHolderTrans.Text = text; + } } if (!string.IsNullOrEmpty(parameters["BackColor"])) @@ -265,7 +270,6 @@ public override ImageInfo GenerateImage(NameValueCollection parameters) break; default: - string imageTransformClass = ConfigurationManager.AppSettings["DnnImageHandler." + mode]; string[] imageTransformClassParts = imageTransformClass.Split(','); var asm = Assembly.LoadFrom(Globals.ApplicationMapPath + @"\bin\" + diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj index 1f2f76df4ba..1283603f3e9 100644 --- a/DNN Platform/Website/DotNetNuke.Website.csproj +++ b/DNN Platform/Website/DotNetNuke.Website.csproj @@ -1254,6 +1254,7 @@ + web.config diff --git a/DNN Platform/Website/Install/Config/09.13.04.config b/DNN Platform/Website/Install/Config/09.13.04.config new file mode 100644 index 00000000000..da8993ec14d --- /dev/null +++ b/DNN Platform/Website/Install/Config/09.13.04.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/Website/development.config b/DNN Platform/Website/development.config index 6ab918f3fe6..6fd19300443 100644 --- a/DNN Platform/Website/development.config +++ b/DNN Platform/Website/development.config @@ -37,8 +37,8 @@ - @@ -55,7 +55,7 @@ - @@ -64,7 +64,9 @@ - + + + @@ -148,19 +150,19 @@ - - @@ -192,33 +194,33 @@ - - @@ -443,8 +445,8 @@ - diff --git a/DNN Platform/Website/release.config b/DNN Platform/Website/release.config index f8c8e9d6a34..bcc0f65e542 100644 --- a/DNN Platform/Website/release.config +++ b/DNN Platform/Website/release.config @@ -37,8 +37,8 @@ - @@ -55,7 +55,7 @@ - @@ -64,7 +64,9 @@ - + + + @@ -126,8 +128,8 @@ - @@ -149,19 +151,19 @@ - - @@ -193,33 +195,33 @@ - - @@ -440,8 +442,8 @@ -