Changeset 8722 for trunk/include/common.inc.php
- Timestamp:
- Jan 17, 2011, 7:48:13 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/common.inc.php
r8247 r8722 71 71 $filter = array(); 72 72 73 @include(PHPWG_ROOT_PATH .'local/config/database.inc.php'); 73 if (is_file(PHPWG_ROOT_PATH .'local/config/multisite.inc.php')) 74 { 75 include(PHPWG_ROOT_PATH .'local/config/multisite.inc.php'); 76 define('PWG_LOCAL_DIR', $conf['local_dir_site']); 77 } 78 else 79 { 80 define('PWG_LOCAL_DIR', 'local/'); 81 } 82 83 @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php'); 74 84 if (!defined('PHPWG_INSTALLED')) 75 85 { … … 93 103 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 94 104 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 105 if (isset($conf['local_dir_site'])) 106 { 107 @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR. 'config/config.inc.php'); 108 } 95 109 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); 96 110 … … 152 166 } 153 167 trigger_action('loading_lang'); 154 load_language('lang', PHPWG_ROOT_PATH. 'local/', array('no_fallback'=>true, 'local'=>true) );168 load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) ); 155 169 156 170 // only now we can set the localized username of the guest user (and not in
Note: See TracChangeset
for help on using the changeset viewer.