diff options
| author | rvelices <rv-github@modusoptimus.com> | 2011-12-19 20:27:05 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2011-12-19 20:27:05 +0000 |
| commit | e8760615eb62b16a6c21f9d3b08ee063f552b3a3 (patch) | |
| tree | 6391d92f5e9ea6fec45679f6a7d66f99441bc120 | |
| parent | d70a18d52144b55949151cc3b9ccc99c3bac48a3 (diff) | |
simplification of 'startup phase' (forgot install.php)
git-svn-id: http://piwigo.org/svn/trunk@12769 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | install.php | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/install.php b/install.php index 9a877a25b..1ba8ab5ca 100644 --- a/install.php +++ b/install.php @@ -105,22 +105,9 @@ else $prefixeTable = DEFAULT_PREFIX_TABLE; } -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'); -if (isset($conf['local_dir_site'])) -{ - @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php'); -} +defined('PWG_LOCAL_DIR') or define('PWG_LOCAL_DIR', 'local/'); // download database config file if exists if (!empty($_GET['dl']) && file_exists($conf['local_data_dir'].'/pwg_'.$_GET['dl'])) |