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 /include/common.inc.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 'include/common.inc.php')
| -rw-r--r-- | include/common.inc.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index c898ec546..a67433000 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -70,7 +70,17 @@ $header_msgs = array(); $header_notes = array(); $filter = array(); -@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'); if (!defined('PHPWG_INSTALLED')) { header('Location: install.php'); @@ -92,6 +102,10 @@ foreach( array( 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'); if(isset($conf['show_php_errors']) && !empty($conf['show_php_errors'])) @@ -151,7 +165,7 @@ if ( is_admin() || (defined('IN_ADMIN') and IN_ADMIN) ) load_language('admin.lang'); } trigger_action('loading_lang'); -load_language('lang', PHPWG_ROOT_PATH.'local/', array('no_fallback'=>true, 'local'=>true) ); +load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) ); // only now we can set the localized username of the guest user (and not in // include/user.inc.php) |