Commit 5fac51adce8a81efc32a6f450674eabfa6d412a2

Authored by Conrad Vermeulen
1 parent 1c5198bf

KTS-3583

"CLONE -Two Files with Same Name, Different DocID but both listings in KTExplorer point to one file, and not the other.(SUP-963)"
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@9528 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing 1 changed file with 2 additions and 4 deletions
ktapi/KTAPIDocument.inc.php
@@ -517,8 +517,6 @@ class KTAPI_Document extends KTAPI_FolderItem @@ -517,8 +517,6 @@ class KTAPI_Document extends KTAPI_FolderItem
517 return $result; 517 return $result;
518 } 518 }
519 519
520 - $tgt_folder = $target_folder->get_folder();  
521 -  
522 $name = $this->document->getName(); 520 $name = $this->document->getName();
523 $clash = KTDocumentUtil::nameExists($target_folder, $name); 521 $clash = KTDocumentUtil::nameExists($target_folder, $name);
524 if ($clash && !is_null($newname)) 522 if ($clash && !is_null($newname))
@@ -530,7 +528,7 @@ class KTAPI_Document extends KTAPI_FolderItem @@ -530,7 +528,7 @@ class KTAPI_Document extends KTAPI_FolderItem
530 { 528 {
531 if (is_null($newname)) 529 if (is_null($newname))
532 { 530 {
533 - $name = KTDocumentUtil::getUniqueDocumentName($tgt_folder, $name); 531 + $name = KTDocumentUtil::getUniqueDocumentName($target_folder, $name);
534 } 532 }
535 else 533 else
536 { 534 {
@@ -550,7 +548,7 @@ class KTAPI_Document extends KTAPI_FolderItem @@ -550,7 +548,7 @@ class KTAPI_Document extends KTAPI_FolderItem
550 { 548 {
551 if (is_null($newfilename)) 549 if (is_null($newfilename))
552 { 550 {
553 - $filename = KTDocumentUtil::getUniqueFilename($tgt_folder, $newfilename); 551 + $filename = KTDocumentUtil::getUniqueFilename($target_folder, $newfilename);
554 } 552 }
555 else 553 else
556 { 554 {