From 76884a79f80c45617231fd7b29b9aa88d449363f Mon Sep 17 00:00:00 2001 From: nbm Date: Tue, 8 Nov 2005 14:42:31 +0000 Subject: [PATCH] Use KT_LIB_DIR rather than $default->... due to scoping issues. global $default anyway for other bits of code. --- presentation/webpageTemplate.inc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/presentation/webpageTemplate.inc b/presentation/webpageTemplate.inc index 6630ee3..69bc15c 100644 --- a/presentation/webpageTemplate.inc +++ b/presentation/webpageTemplate.inc @@ -24,15 +24,16 @@ * @version $Revision$ * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa */ +global $default; KTUtil::extractGPC('fBrowseType', 'fFolderID', 'fDocumentID', 'fCategoryName', 'fDocumentTypeID'); -require_once("$default->fileSystemRoot/lib/users/User.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternImage.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableLinks.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); -require_once("$default->fileSystemRoot/lib/visualpatterns/NavBar.inc"); +require_once(KT_LIB_DIR . "/users/User.inc"); +require_once(KT_LIB_DIR . "/visualpatterns/PatternMainPage.inc"); +require_once(KT_LIB_DIR . "/visualpatterns/PatternImage.inc"); +require_once(KT_LIB_DIR . "/visualpatterns/PatternTableLinks.inc"); +require_once(KT_LIB_DIR . "/visualpatterns/PatternTableSqlQuery.inc"); +require_once(KT_LIB_DIR . "/visualpatterns/NavBar.inc"); // create the navbar and north payload $navbar = & new NavBar($fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocumentTypeID); @@ -93,6 +94,7 @@ $westLoad = "setHtml($westLoad); +global $main; $main = new PatternMainPage(); $main->setNorthPayload($navbar); $main->setNorthWestPayload($nwPayLoad); -- libgit2 0.21.4