inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
108293: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      108286: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         108236: Merged /NESS/5.0.2-2015_07_13 (5.0.2) to URL: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.0.2 (..)
            108185: MNT-14370 : Cannot delete a folder through FTP


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-15 17:12:59 +00:00
parent 60451f01f8
commit e5dc02a8c1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
View File

@@ -1126,7 +1126,7 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
// Check if the folder is empty
// Get pseudo files
PseudoFileList pseudoFileList = new PseudoFileList();
if (ctx.isPseudoFilesEnabled())
if (session.isPseudoFilesEnabled() && ctx.isPseudoFilesEnabled())
{
pseudoFileList = ctx.getPseudoFileOverlay().searchPseudoFiles(nodeRef, "*");
}