Peter M. Groen / knowledgetree

Commit 20f96a9a0b55c3a42c62caba0fa47bb90141aacb

Authored by jonathan_byrne
1 parent 6ac36a61

Merged in from DEV trunk... 

KTS-2724
"Search Results browsing error"

Fixed. Added a full url path for redirection.

Committed By: Jonathan Byrne
Reviewed By: Kevin Fourie


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.4.5-Release-Branch@7744 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 9 additions and 4 deletions
lib/templating/kt3template.inc.php
  View file @20f96a9
@@ -156,10 +156,15 @@ class KTPage { @@ -156,10 +156,15 @@ class KTPage {
156 function initMenu() { 156 function initMenu() {
157 // FIXME: we lost the getDefaultAction stuff - do we care? 157 // FIXME: we lost the getDefaultAction stuff - do we care?
158 // note that key == action. this is _important_, since we crossmatch the breadcrumbs against this for "active" 158 // note that key == action. this is _important_, since we crossmatch the breadcrumbs against this for "active"
159 - $this->menu = array();  
160 - $this->menu['dashboard'] = array('label' => _kt("Dashboard"), 'url' => 'dashboard.php');  
161 - $this->menu['browse'] = array('label' => _kt("Browse Documents"), 'url' => 'browse.php');  
162 - $this->menu['administration'] = array('label' => _kt("DMS Administration"), 'url' => 'admin.php'); 159 + $oConfig =& KTConfig::getSingleton();
  160 + $bSSL = $oConfig->get('sslEnabled', false);
  161 + if($bSSL) { $sProtocol = 'https'; }
  162 + else { $sProtocol = 'http'; }
  163 + $sBaseUrl = $sProtocol.'://'.$_SERVER['HTTP_HOST'].$GLOBALS['KTRootUrl'];
  164 + $this->menu = array();
  165 + $this->menu['dashboard'] = array('label' => _kt("Dashboard"), 'url' => $sBaseUrl.'/dashboard.php');
  166 + $this->menu['browse'] = array('label' => _kt("Browse Documents"), 'url' => $sBaseUrl.'/browse.php');
  167 + $this->menu['administration'] = array('label' => _kt("DMS Administration"), 'url' => $sBaseUrl.'/admin.php');
163 /* 168 /*
164 $this->menu = array("dashboard" => $this->_actionHelper(array("name" => _kt("Dashboard"), "action" => "dashboard", "active" => 0)), 169 $this->menu = array("dashboard" => $this->_actionHelper(array("name" => _kt("Dashboard"), "action" => "dashboard", "active" => 0)),
165 "browse" => $this->_actionHelper(array("name" => _kt("Browse Documents"), "action" => "browse", "active" => 0)), 170 "browse" => $this->_actionHelper(array("name" => _kt("Browse Documents"), "action" => "browse", "active" => 0)),