From 732fb8a933c96ab268c3282a0846ac1b48ba41b1 Mon Sep 17 00:00:00 2001 From: rob Date: Fri, 21 Feb 2003 14:33:53 +0000 Subject: [PATCH] Added missing slash to folder path --- lib/foldermanagement/Folder.inc | 2 +- presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php | 2 +- presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/foldermanagement/Folder.inc b/lib/foldermanagement/Folder.inc index 1591b59..ce3c20a 100644 --- a/lib/foldermanagement/Folder.inc +++ b/lib/foldermanagement/Folder.inc @@ -373,7 +373,7 @@ class Folder { } return $default->owl_FileDir . "/" . Folder::getFolderName($iFolderID) . "/";*/ $oFolder = Folder::get($iFolderID); - return $default->owl_FileDir . "/" . $oFolder->sFullPath . "/" . $oFolder->getName(); + return $default->owl_FileDir . "/" . $oFolder->sFullPath . "/" . $oFolder->getName() . "/"; } /** diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php index 1bc99ff..f3a4090 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php @@ -29,7 +29,7 @@ if (checkSession()) { //deletion of document is confirmed $oDocument = Document::get($fDocumentID); if (isset($oDocument)) { - $sDocumentPath = Folder::getFolderPath($oDocument->getFolderID()) . $oDocument->getFileName(); + $sDocumentPath = Folder::getFolderPath($oDocument->getFolderID()) . $oDocument->getFileName(); $oDocumentTransaction = & new DocumentTransaction($fDocumentID, "Document deleted", DELETE); $oDocumentTransaction->create(); if ($oDocument->delete()) { diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc index 33db82b..abffac5 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc @@ -11,7 +11,7 @@ function getDocumentPath($iFolderID, $sDocumentName) { global $default; - $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), Folder::getFullFolderPath($iFolderID), "$default->owl_root_url/control.php?action=browse") . " > " . $sDocumentName; + $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($iFolderID), Folder::getFolderPathNamesAsArray($iFolderID), "$default->owl_root_url/control.php?action=browse") . " > " . $sDocumentName; return "
$sDocumentPath
\n"; } -- libgit2 0.21.4