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 /upgrade_feed.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 'upgrade_feed.php')
| -rw-r--r-- | upgrade_feed.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/upgrade_feed.php b/upgrade_feed.php index 5ddfa0dc6..bfcb3401f 100644 --- a/upgrade_feed.php +++ b/upgrade_feed.php @@ -32,9 +32,24 @@ define('PHPWG_ROOT_PATH', './'); 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'); -include(PHPWG_ROOT_PATH.'local/config/database.inc.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'); // +-----------------------------------------------------------------------+ |