Fix bug #DNN-21129

- Possible regression due to DNN-7984
dnnsoftware · Jun 26, 2018 · 39484ba · 39484ba
1 parent b5a9a73
commit 39484ba
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs b/DNN Platform/DotNetNuke.Web/InternalServices/FileUploadController.cs
@@ -53,7 +53,6 @@
 using ContentDisposition = System.Net.Mime.ContentDisposition;
 using FileInfo = DotNetNuke.Services.FileSystem.FileInfo;
 using System.Web;
-using DotNetNuke.Entities.Tabs;
 
 namespace DotNetNuke.Web.InternalServices
 {
@@ -426,10 +425,19 @@ private static FileUploadDto UploadFile(
                 }
 
                 var folderManager = FolderManager.Instance;
+                var effectivePortalId = isHostPortal ? Null.NullInteger : portalId;                
+                var folderInfo = folderManager.GetFolder(effectivePortalId, folder);
 
-                var effectivePortalId = isHostPortal ? Null.NullInteger : portalId;
+                int userId;
 
-                var folderInfo = folderManager.GetFolder(effectivePortalId, folder);
+                if (folderInfo == null && IsUserFolder(folder, out userId))
+                {
+                    var user = UserController.GetUserById(effectivePortalId, userId);
+                    if (user != null)
+                    {
+                        folderInfo = folderManager.GetUserFolder(user);
+                    }
+                }
 
                 if (!FolderPermissionController.HasFolderPermission(portalId, folder, "WRITE")
                     && !FolderPermissionController.HasFolderPermission(portalId, folder, "ADD"))