Changeset 12768 for trunk/upgrade.php
- Timestamp:
- Dec 19, 2011, 9:25:42 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/upgrade.php
r12296 r12768 25 25 26 26 // load config file 27 if (is_file(PHPWG_ROOT_PATH .'local/config/multisite.inc.php')) 28 { 29 include(PHPWG_ROOT_PATH .'local/config/multisite.inc.php'); 30 define('PWG_LOCAL_DIR', $conf['local_dir_site']); 31 } 32 else 33 { 34 define('PWG_LOCAL_DIR', 'local/'); 35 } 27 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 28 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 29 defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); 36 30 37 31 $config_file = PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'config/database.inc.php'; … … 48 42 49 43 include($config_file); 50 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');51 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');52 if (isset($conf['local_dir_site']))53 {54 @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');55 }56 44 57 45 // $conf is not used for users tables - define cannot be re-defined
Note: See TracChangeset
for help on using the changeset viewer.