From 20dcc60cb21efc31efcb53df8bd06ee39bf617f9 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Thu, 9 Oct 2008 14:08:04 +0000 Subject: [PATCH] Merged in... --- ktapi/KTAPIDocument.inc.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ktapi/KTAPIDocument.inc.php b/ktapi/KTAPIDocument.inc.php index fbc27ed..840105d 100644 --- a/ktapi/KTAPIDocument.inc.php +++ b/ktapi/KTAPIDocument.inc.php @@ -517,8 +517,6 @@ class KTAPI_Document extends KTAPI_FolderItem return $result; } - $tgt_folder = $target_folder->get_folder(); - $name = $this->document->getName(); $clash = KTDocumentUtil::nameExists($target_folder, $name); if ($clash && !is_null($newname)) @@ -530,7 +528,7 @@ class KTAPI_Document extends KTAPI_FolderItem { if (is_null($newname)) { - $name = KTDocumentUtil::getUniqueDocumentName($tgt_folder, $name); + $name = KTDocumentUtil::getUniqueDocumentName($target_folder, $name); } else { @@ -550,7 +548,7 @@ class KTAPI_Document extends KTAPI_FolderItem { if (is_null($newfilename)) { - $filename = KTDocumentUtil::getUniqueFilename($tgt_folder, $newfilename); + $filename = KTDocumentUtil::getUniqueFilename($target_folder, $newfilename); } else { -- libgit2 0.21.4