From 74ca8a76dbe5dfbb9321e6bac9fa33e18dc5109d Mon Sep 17 00:00:00 2001
From: bshuttle <bshuttle@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 29 May 2006 13:10:19 +0000
Subject: [PATCH] Bulk Import:  duplicate folders fix.

---
 lib/import/bulkimport.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/import/bulkimport.inc.php b/lib/import/bulkimport.inc.php
index e097626..dc64047 100644
--- a/lib/import/bulkimport.inc.php
+++ b/lib/import/bulkimport.inc.php
@@ -74,7 +74,7 @@ class KTBulkImportManager {
             return $aFolderPaths;
         }
         foreach ($aFolderPaths as $sFolderPath) {
-            if (Folder::folderExistsName($sFolderPath, KTUtil::getId($oFolder))) {
+            if (Folder::folderExistsName(basename($sFolderPath), KTUtil::getId($oFolder))) {
                 $_SESSION['KTErrorMessage'][] = sprintf(_kt("The folder %s is already present in %s.  Adding files into pre-existing folder."), $sFolderPath, $oFolder->getName());
                 $aOptions = Folder::getList("parent_id = " . KTUtil::getId($oFolder) . ' AND name = "' . DBUtil::escapeSimple($sFolderPath) . '"');
                 if (PEAR::isError($aOptions)) { 
--
libgit2 0.21.4