Commit 673620719129613b82a785c38fdfeb3bf68c6c73
1 parent
13694033
KTC-304
"Navigating to a document from a tag cloud, and deleting it using the bottom 'delete' causes an error" Fixed. Added the full url to the top menu items. Committed By: Megan Watson Reviewed By: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@7838 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
10 additions
and
3 deletions
lib/templating/kt3template.inc.php
| ... | ... | @@ -158,10 +158,17 @@ class KTPage { |
| 158 | 158 | function initMenu() { |
| 159 | 159 | // FIXME: we lost the getDefaultAction stuff - do we care? |
| 160 | 160 | // note that key == action. this is _important_, since we crossmatch the breadcrumbs against this for "active" |
| 161 | + global $default; | |
| 162 | + $rootUrl = $default->rootUrl; | |
| 163 | + $bSSL = $default->sslEnabled; | |
| 164 | + | |
| 165 | + $sProtocol = ($bSSL) ? 'https' : 'http'; | |
| 166 | + $sBaseUrl = $sProtocol.'://'.$_SERVER['HTTP_HOST'].$rootUrl; | |
| 167 | + | |
| 161 | 168 | $this->menu = array(); |
| 162 | - $this->menu['dashboard'] = array('label' => _kt("Dashboard"), 'url' => 'dashboard.php'); | |
| 163 | - $this->menu['browse'] = array('label' => _kt("Browse Documents"), 'url' => 'browse.php'); | |
| 164 | - $this->menu['administration'] = array('label' => _kt("DMS Administration"), 'url' => 'admin.php'); | |
| 169 | + $this->menu['dashboard'] = array('label' => _kt("Dashboard"), 'url' => $sBaseUrl.'/dashboard.php'); | |
| 170 | + $this->menu['browse'] = array('label' => _kt("Browse Documents"), 'url' => $sBaseUrl.'/browse.php'); | |
| 171 | + $this->menu['administration'] = array('label' => _kt("DMS Administration"), 'url' => $sBaseUrl.'/admin.php'); | |
| 165 | 172 | /* |
| 166 | 173 | $this->menu = array("dashboard" => $this->_actionHelper(array("name" => _kt("Dashboard"), "action" => "dashboard", "active" => 0)), |
| 167 | 174 | "browse" => $this->_actionHelper(array("name" => _kt("Browse Documents"), "action" => "browse", "active" => 0)), | ... | ... |