Changeset 12768 for trunk/upgrade.php

Timestamp:

Dec 19, 2011, 9:25:42 PM (12 years ago)

Author:

rvelices

Message:

simplification of 'startup phase' - multisite.inc.php is not required anymore / database.inc.php is included after config.

File:

• trunk/upgrade.php (modified) (2 diffs)

trunk/upgrade.php

@@ -25 +25 @@
 
 // load config file
-if (is_file(PHPWG_ROOT_PATH .'local/config/multisite.inc.php'))
-{
-  include(PHPWG_ROOT_PATH .'local/config/multisite.inc.php');
-  define('PWG_LOCAL_DIR', $conf['local_dir_site']);
-}
-else
-{
-  define('PWG_LOCAL_DIR', 'local/');
-}
+include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
+@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
+defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/');
 
 $config_file = PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'config/database.inc.php';
@@ -48 +42 @@
 
 include($config_file);
-include(PHPWG_ROOT_PATH . 'include/config_default.inc.php');
-@include(PHPWG_ROOT_PATH. 'local/config/config.inc.php');
-if (isset($conf['local_dir_site']))
-{
-  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php');
-}
 
 // $conf is not used for users tables - define cannot be re-defined