From d70a18d52144b55949151cc3b9ccc99c3bac48a3 Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 19 Dec 2011 20:25:42 +0000 Subject: 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 --- upgrade.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'upgrade.php') 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'); -- cgit v1.2.3