Fix deletion on expunge for the hashed layout.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5477 c91229c3-7414-0410-bfa2-8a42b809f60b

Fix deletion on expunge for the hashed layout.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5477 c91229c3-7414-0410-bfa2-8a42b809f60b
Neil Blakey-Milner
1 parent 46098f3e
Showing 1 changed file with 2 additions and 7 deletions
lib/storage/ondiskhashedstoragemanager.inc.php
@@ -260,17 +260,12 @@ class KTOnDiskHashedStorageManager extends KTStorageManager {
         $oConfig =& KTConfig::getSingleton();
         $sCurrentPath = $this->getPath($oDocument);
  
-        // check if the deleted folder exists and create it if not
-        $sDeletedPrefix = sprintf("%s/Deleted", $oConfig->get('urls/documentRoot'));
         $sDocumentRoot = $oConfig->get('urls/documentRoot');
  
         $aVersions = KTDocumentContentVersion::getByDocument($oDocument);
         foreach ($aVersions as $oVersion) {
-            $sPath = sprintf("Deleted/%s-%s", $oVersion->getId(), $oVersion->getFileName());
-            $sFullPath = sprintf("%s/%s", $sDocumentRoot, $sPath);
-            if (file_exists($sFullPath)) {
-                unlink($sFullPath);
-            }
+            $sPath = sprintf('%s/%s', $sDocumentRoot, $oVersion->getStoragePath());
+            @unlink($sPath);
         }
         return true;
     }