Peter M. Groen / knowledgetree

Commit 6c24cc3baeee8d514a39b2fb9a98ece643ff0918

Authored by rob
1 parent 30bbbc9e

Added check for no default->rootUrl when rendering a folder list 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2014 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 7 additions and 2 deletions
presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc
  View file @6c24cc3
@@ -82,13 +82,18 @@ function renderFolderList($fFolderID, $sLinkURL) { @@ -82,13 +82,18 @@ function renderFolderList($fFolderID, $sLinkURL) {
82 "FROM $default->owl_folders_table AS F " . 82 "FROM $default->owl_folders_table AS F " .
83 "WHERE F.parent_id = " . $fFolderID . " " . 83 "WHERE F.parent_id = " . $fFolderID . " " .
84 "ORDER BY F.name ASC"; 84 "ORDER BY F.name ASC";
85 - 85 +
86 $aColumns = array("name"); 86 $aColumns = array("name");
87 $aColumnTypes = array(3); 87 $aColumnTypes = array(3);
88 $aColumnHeaderNames = array("Folder"); 88 $aColumnHeaderNames = array("Folder");
89 $aDBColumns = array("id"); 89 $aDBColumns = array("id");
90 $aQueryStringVariableNames = array("fFolderID"); 90 $aQueryStringVariableNames = array("fFolderID");
91 - $aLinkURLs = array("$default->rootUrl/$sLinkURL"); 91 + $aLinkURLs = array();
  92 + if (strlen($default->rootUrl) > 0) {
  93 + $aLinkURLs = array("$default->rootUrl/$sLinkURL");
  94 + } else {
  95 + $aLinkURLs = array("$sLinkURL");
  96 + }
92 97
93 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", $aLinkURLs, $aDBColumns, $aQueryStringVariableNames); 98 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaderNames, "100%", $aLinkURLs, $aDBColumns, $aQueryStringVariableNames);
94 $oPatternTableSqlQuery->setImageURL("$default->graphicsUrl/widgets/dfolder.gif"); 99 $oPatternTableSqlQuery->setImageURL("$default->graphicsUrl/widgets/dfolder.gif");