From d291ad0c49a14a15dbe3e0e2b3e78130dc159700 Mon Sep 17 00:00:00 2001
From: berkarslan-xo <berk.arslan@aurea.com>
Date: Wed, 6 Nov 2019 14:54:09 +0300
Subject: [PATCH 1/2] DNN-32474 - Recursive delete option is added

---
 DNN Platform/Library/Services/FileSystem/FolderManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DNN Platform/Library/Services/FileSystem/FolderManager.cs b/DNN Platform/Library/Services/FileSystem/FolderManager.cs
index ad6f8f338a2..277e1a048e6 100644
--- a/DNN Platform/Library/Services/FileSystem/FolderManager.cs	
+++ b/DNN Platform/Library/Services/FileSystem/FolderManager.cs	
@@ -190,7 +190,7 @@ private void DeleteFolderInternal(IFolderInfo folder, bool isCascadeDeleting)
 
             if (DirectoryWrapper.Instance.Exists(folder.PhysicalPath))
             {
-                DirectoryWrapper.Instance.Delete(folder.PhysicalPath, false);
+                DirectoryWrapper.Instance.Delete(folder.PhysicalPath, true);
             }
             DeleteFolder(folder.PortalID, folder.FolderPath);
 

From b0c58c1653ad2889a66c60271d66cfacd1e38ce3 Mon Sep 17 00:00:00 2001
From: berkarslan-xo <berk.arslan@aurea.com>
Date: Fri, 6 Dec 2019 16:52:06 +0300
Subject: [PATCH 2/2] MOBINST-30122 - FlagSrc page header icon fix

---
 .../Library/UI/Skins/Controls/LanguageTokenReplace.cs       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/DNN Platform/Library/UI/Skins/Controls/LanguageTokenReplace.cs b/DNN Platform/Library/UI/Skins/Controls/LanguageTokenReplace.cs
index b724325649b..8613af5f9f1 100644
--- a/DNN Platform/Library/UI/Skins/Controls/LanguageTokenReplace.cs	
+++ b/DNN Platform/Library/UI/Skins/Controls/LanguageTokenReplace.cs	
@@ -23,6 +23,7 @@
 using System;
 using System.Collections.Specialized;
 using System.Globalization;
+using System.IO;
 using System.Web;
 
 using DotNetNuke.Common;
@@ -56,6 +57,8 @@ public LanguageTokenReplace()
 
     public class LanguagePropertyAccess : IPropertyAccess
     {
+        private const string FlagIconPhysicalLocation = @"~\images\Flags";
+        private const string NonExistingFlagIconFileName = "none.gif";
         private readonly PortalSettings objPortal;
         public LanguageTokenReplace objParent;
 
@@ -74,7 +77,8 @@ public string GetProperty(string propertyName, string format, CultureInfo format
                 case "url":
                     return NewUrl(objParent.Language);
                 case "flagsrc":
-                    return "/" + objParent.Language + ".gif";
+                    var mappedGifFile = PathUtils.Instance.MapPath($@"{FlagIconPhysicalLocation}\{objParent.Language}.gif");
+                    return File.Exists(mappedGifFile) ? $"/{objParent.Language}.gif" : $@"/{NonExistingFlagIconFileName}";
                 case "selected":
                     return (objParent.Language == CultureInfo.CurrentCulture.Name).ToString();
                 case "label":