Peter M. Groen / knowledgetree

You need to sign in before continuing.

Commit 525653e72762d946a27f908b2e16a3503ff65e01

Authored by Neil Blakey-Milner
1 parent e6483f51

Use KT_LIB_DIR rather than $default->... due to scoping issues. global 

$default anyway for other bits of code.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3932 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 8 additions and 6 deletions
presentation/webpageTemplate.inc
  View file @525653e
@@ -24,15 +24,16 @@ @@ -24,15 +24,16 @@
24 * @version $Revision$ 24 * @version $Revision$
25 * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa 25 * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
26 */ 26 */
  27 +global $default;
27 28
28 KTUtil::extractGPC('fBrowseType', 'fFolderID', 'fDocumentID', 'fCategoryName', 'fDocumentTypeID'); 29 KTUtil::extractGPC('fBrowseType', 'fFolderID', 'fDocumentID', 'fCategoryName', 'fDocumentTypeID');
29 30
30 -require_once("$default->fileSystemRoot/lib/users/User.inc");  
31 -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc");  
32 -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternImage.inc");  
33 -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableLinks.inc");  
34 -require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");  
35 -require_once("$default->fileSystemRoot/lib/visualpatterns/NavBar.inc"); 31 +require_once(KT_LIB_DIR . "/users/User.inc");
  32 +require_once(KT_LIB_DIR . "/visualpatterns/PatternMainPage.inc");
  33 +require_once(KT_LIB_DIR . "/visualpatterns/PatternImage.inc");
  34 +require_once(KT_LIB_DIR . "/visualpatterns/PatternTableLinks.inc");
  35 +require_once(KT_LIB_DIR . "/visualpatterns/PatternTableSqlQuery.inc");
  36 +require_once(KT_LIB_DIR . "/visualpatterns/NavBar.inc");
36 37
37 // create the navbar and north payload 38 // create the navbar and north payload
38 $navbar = & new NavBar($fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocumentTypeID); 39 $navbar = & new NavBar($fBrowseType, $fFolderID, $fDocumentID, $fCategoryName, $fDocumentTypeID);
@@ -93,6 +94,7 @@ $westLoad = "<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" width=\"100 @@ -93,6 +94,7 @@ $westLoad = "<table cellspacing=\"0\" cellpadding=\"2\" border=\"0\" width=\"100
93 $westPayLoad = new PatternCustom; 94 $westPayLoad = new PatternCustom;
94 $westPayLoad->setHtml($westLoad); 95 $westPayLoad->setHtml($westLoad);
95 96
  97 +global $main;
96 $main = new PatternMainPage(); 98 $main = new PatternMainPage();
97 $main->setNorthPayload($navbar); 99 $main->setNorthPayload($navbar);
98 $main->setNorthWestPayload($nwPayLoad); 100 $main->setNorthWestPayload($nwPayLoad);