diff options
| author | plegall <plg@piwigo.org> | 2011-01-17 18:48:13 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2011-01-17 18:48:13 +0000 |
| commit | 8ccd3a203d407f549cd8697a5fa66181e90d9871 (patch) | |
| tree | 5d0e203c02905f157316683aa0bc75126fb5f171 /install.php | |
| parent | 91fc33dc8eea8bfd38f36f34c1abaa389b7e92e5 (diff) | |
feature 2112 added: ability to set an additional local directory
$conf['local_dir_site'] in local/config/multisite.inc.php
git-svn-id: http://piwigo.org/svn/trunk@8722 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/install.php b/install.php index 5850e9180..661598f04 100644 --- a/install.php +++ b/install.php @@ -114,8 +114,22 @@ 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'); +} // download database config file if exists if (!empty($_GET['dl']) && file_exists($conf['local_data_dir'].'/pwg_'.$_GET['dl'])) @@ -152,7 +166,7 @@ if (isset($_POST['install'])) $infos = array(); $errors = array(); -$config_file = PHPWG_ROOT_PATH . 'local/config/database.inc.php'; +$config_file = PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php'; if (@file_exists($config_file)) { include($config_file); |