DNN-32474 - Recursive delete option is added (#3249)

dnnsoftware · Nov 14, 2019 · 6a95aa4 · 6a95aa4
1 parent 6a935af
commit 6a95aa4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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);
 

diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FolderManagerTests.cs b/DNN Platform/Tests/DotNetNuke.Tests.Core/Providers/Folder/FolderManagerTests.cs
@@ -443,7 +443,7 @@ public void DeleteFolder_Calls_Directory_Delete_When_Directory_Exists()
             _mockFolder.Setup(mf => mf.DeleteFolder(_folderInfo.Object));
 
             _directory.Setup(d => d.Exists(Constants.FOLDER_ValidFolderPath)).Returns(true);
-            _directory.Setup(d => d.Delete(Constants.FOLDER_ValidFolderPath, false)).Verifiable();
+            _directory.Setup(d => d.Delete(Constants.FOLDER_ValidFolderPath, true)).Verifiable();
 
             _mockFolderManager.Setup(mfm => mfm.DeleteFolder(Constants.CONTENT_ValidPortalId, Constants.FOLDER_ValidFolderRelativePath));