aboutsummaryrefslogtreecommitdiffstats
path: root/upgrade.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-12-19 20:25:42 +0000
committerrvelices <rv-github@modusoptimus.com>2011-12-19 20:25:42 +0000
commitd70a18d52144b55949151cc3b9ccc99c3bac48a3 (patch)
tree3b444695dd58ff4b5b944b83ddcdb5f30cce589a /upgrade.php
parent4bbd5f66492997cc49276034949a5f984ef6351d (diff)
simplification of 'startup phase' - multisite.inc.php is not required anymore / database.inc.php is included after config.
git-svn-id: http://piwigo.org/svn/trunk@12768 68402e56-0260-453c-a942-63ccdbb3a9ee
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');