diff options
| author | rvelices <rv-github@modusoptimus.com> | 2011-12-19 20:25:42 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2011-12-19 20:25:42 +0000 |
| commit | d70a18d52144b55949151cc3b9ccc99c3bac48a3 (patch) | |
| tree | 3b444695dd58ff4b5b944b83ddcdb5f30cce589a /upgrade_feed.php | |
| parent | 4bbd5f66492997cc49276034949a5f984ef6351d (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_feed.php | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/upgrade_feed.php b/upgrade_feed.php index ee48bd0e4..8ff3c842f 100644 --- a/upgrade_feed.php +++ b/upgrade_feed.php @@ -29,28 +29,17 @@ if (version_compare(PHP_VERSION, '5', '<')) define('PHPWG_ROOT_PATH', './'); +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/'); + +include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php'); +include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); + include_once(PHPWG_ROOT_PATH.'include/functions.inc.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php'); -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.PWG_LOCAL_DIR .'config/database.inc.php'); -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'); -} -include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); // +-----------------------------------------------------------------------+ // | Check Access and exit when it is not ok | |