Commit 3f5105fa8a4301ab3fce735438914a34dee1b757

Authored by Neil Blakey-Milner
1 parent d168d996

Deal with rootUrl already being in the given URLs.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3173 c91229c3-7414-0410-bfa2-8a42b809f60b
presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
@@ -109,7 +109,7 @@ function renderFolderList($iFolderID, $sLinkURL) { @@ -109,7 +109,7 @@ function renderFolderList($iFolderID, $sLinkURL) {
109 $aLinkURLs = array("$sLinkURL"); 109 $aLinkURLs = array("$sLinkURL");
110 110
111 $aLinkURLs = array(); 111 $aLinkURLs = array();
112 - if (strlen($default->rootUrl) > 0) { 112 + if ((strlen($default->rootUrl) > 0) && (!strstr($sLinkURL, $default->rootUrl))) {
113 $aLinkURLs = array("$default->rootUrl/$sLinkURL"); 113 $aLinkURLs = array("$default->rootUrl/$sLinkURL");
114 } else { 114 } else {
115 $aLinkURLs = array("$sLinkURL"); 115 $aLinkURLs = array("$sLinkURL");