aboutsummaryrefslogtreecommitdiffstats
path: root/upgrade.php
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--upgrade.php18
1 files changed, 3 insertions, 15 deletions
diff --git a/upgrade.php b/upgrade.php
index 43cf70b7a..d06c29205 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -24,15 +24,9 @@
define('PHPWG_ROOT_PATH', './');
// 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';
$config_file_contents = @file_get_contents($config_file);
@@ -47,12 +41,6 @@ if ($php_end_tag === false)
}
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
define('USERS_TABLE', $prefixeTable.'users');