Peter M. Groen / knowledgetree

Commit f528ba0a2bc77805b395fce2d5d8d863afed772a

Authored by Neil Blakey-Milner
1 parent cdc7a448

Don't use $default without declaration, or use KT_LIB_DIR for requires. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3400 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 8 additions and 3 deletions
lib/documentmanagement/Document.inc
  View file @f528ba0
@@ -4,7 +4,10 @@ DEFINE("LIVE", 1); @@ -4,7 +4,10 @@ DEFINE("LIVE", 1);
4 DEFINE("PUBLISHED", 2); 4 DEFINE("PUBLISHED", 2);
5 DEFINE("DELETED", 3); 5 DEFINE("DELETED", 3);
6 DEFINE("ARCHIVED", 4); 6 DEFINE("ARCHIVED", 4);
7 -require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); 7 +DEFINE("STATUS_INCOMPLETE", 5);
  8 +
  9 +require_once(KT_LIB_DIR . "/foldermanagement/Folder.inc");
  10 +
8 /** 11 /**
9 * $Id$ 12 * $Id$
10 * 13 *
@@ -31,6 +34,7 @@ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); @@ -31,6 +34,7 @@ require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
31 * @package lib.documentmanagement 34 * @package lib.documentmanagement
32 * @todo add in document change transaction functionality 35 * @todo add in document change transaction functionality
33 */ 36 */
  37 +
34 class Document extends KTEntity { 38 class Document extends KTEntity {
35 /** primary key */ 39 /** primary key */
36 var $iId; 40 var $iId;
lib/foldermanagement/Folder.inc
  View file @f528ba0
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa 24 * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa
25 * @package lib.foldermanagement 25 * @package lib.foldermanagement
26 */ 26 */
27 -require_once("$default->fileSystemRoot/lib/foldermanagement/PhysicalFolderManagement.inc");  
28 -require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); 27 +require_once(KT_LIB_DIR . "/foldermanagement/PhysicalFolderManagement.inc");
  28 +require_once(KT_LIB_DIR . "/lib/documentmanagement/Document.inc");
29 29
30 class Folder extends KTEntity { 30 class Folder extends KTEntity {
31 31
lib/upgrades/UpgradeFunctions.inc.php
  View file @f528ba0
@@ -11,6 +11,7 @@ class UpgradeFunctions { @@ -11,6 +11,7 @@ class UpgradeFunctions {
11 "addTemplateMimeTypes" => "Add MIME types for Excel and Word templates", 11 "addTemplateMimeTypes" => "Add MIME types for Excel and Word templates",
12 ); 12 );
13 function setPermissionFolder() { 13 function setPermissionFolder() {
  14 + global $default;
14 require_once(KT_LIB_DIR . '/foldermanagement/Folder.inc'); 15 require_once(KT_LIB_DIR . '/foldermanagement/Folder.inc');
15 16
16 $sQuery = "SELECT id FROM $default->folders_table WHERE permission_folder_id = NULL"; 17 $sQuery = "SELECT id FROM $default->folders_table WHERE permission_folder_id = NULL";