diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
index 0c9de04..217b1eb 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
@@ -1,32 +1,58 @@
 <?php
 
 /**
-* HTML information for folder stuff
-*
-*
-* @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
-* @date 23 January 2003
-* @package presentation.lookAndFeel.knowledgeTree.foldermanagement
-*/
+ * $Id$
+ *
+ * HTML information for folder stuff
+ *
+ * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING.
+ * 
+ * @version $Revision$
+ * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
+ * @date 23 January 2003
+ * @package presentation.lookAndFeel.knowledgeTree.foldermanagement
+ */
 
-function displayFolderPathLink($aPathArray) {
+/**
+ * Displays the passed path array as a link
+ * 
+ * @param array containing the path to the folder (folder ids)
+ * @param string the page to link to (defaults to the page this is called from)
+ */
+function displayFolderPathLink($aPathArray, $sLinkPage = "") {
+   if (strlen($sLinkPath) == 0) {
+       $sLinkPath = $_SERVER["PHP_SELF"];
+   }
    // display a separate link to each folder in the path
    for ($i=0; $i<count($aPathArray); $i++) {
-       // retrieve the folder id for this folder name
-       $iFolderID = Folder::getFolderID($aPathArray[$i]);
+       $iFolderID = $aPathArray[$i];
+       // retrieve the folder name for this folder       
+       $sFolderName = Folder::getFolderName($iFolderID);
        // generate a link back to this page setting fFolderID
-       $sLink = generateLink($_SERVER["PHP_SELF"],
+       $sLink = generateLink($sLinkPage,
                             "fBrowseType=folder&fFolderID=$iFolderID", 
-                             $aPathArray[$i]);
+                             $sFolderName);
        $sPathLinks = (strlen($sPathLinks) > 0) ? $sPathLinks . " > " . $sLink : $sLink; 
    }
    return $sPathLinks;
 }
 
-function displayFolderLink($oFolder) {
+
+/**
+ * Displays the passed folder name as a link
+ * 
+ * @param object the folder to link to
+ * @param string the page to link to (defaults to the page this is called from)
+ */
+function displayFolderLink($oFolder, $sLinkPage = "") {
     global $default;
+    
+    if (strlen($sLinkPath) == 0) {
+       $sLinkPath = $_SERVER["PHP_SELF"];
+    }
+
     $sFolderIconPath = generateImage($default->owl_graphics_url . "/widgets/dfolder.gif");
-    return generateLink($_SERVER["PHP_SELF"],
+    return generateLink($sLinkPage,
                         "fBrowseType=folder&fFolderID=" . $oFolder->getID(),
                         $sFolderIconPath .
                         $oFolder->getName());