Commit 74ca8a76dbe5dfbb9321e6bac9fa33e18dc5109d
1 parent
37ef89b6
Bulk Import: duplicate folders fix.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5464 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
1 additions
and
1 deletions
lib/import/bulkimport.inc.php
| @@ -74,7 +74,7 @@ class KTBulkImportManager { | @@ -74,7 +74,7 @@ class KTBulkImportManager { | ||
| 74 | return $aFolderPaths; | 74 | return $aFolderPaths; |
| 75 | } | 75 | } |
| 76 | foreach ($aFolderPaths as $sFolderPath) { | 76 | foreach ($aFolderPaths as $sFolderPath) { |
| 77 | - if (Folder::folderExistsName($sFolderPath, KTUtil::getId($oFolder))) { | 77 | + if (Folder::folderExistsName(basename($sFolderPath), KTUtil::getId($oFolder))) { |
| 78 | $_SESSION['KTErrorMessage'][] = sprintf(_kt("The folder %s is already present in %s. Adding files into pre-existing folder."), $sFolderPath, $oFolder->getName()); | 78 | $_SESSION['KTErrorMessage'][] = sprintf(_kt("The folder %s is already present in %s. Adding files into pre-existing folder."), $sFolderPath, $oFolder->getName()); |
| 79 | $aOptions = Folder::getList("parent_id = " . KTUtil::getId($oFolder) . ' AND name = "' . DBUtil::escapeSimple($sFolderPath) . '"'); | 79 | $aOptions = Folder::getList("parent_id = " . KTUtil::getId($oFolder) . ' AND name = "' . DBUtil::escapeSimple($sFolderPath) . '"'); |
| 80 | if (PEAR::isError($aOptions)) { | 80 | if (PEAR::isError($aOptions)) { |