Changeset 8722 for trunk/include
- Timestamp:
- Jan 17, 2011, 7:48:13 PM (13 years ago)
- Location:
- trunk/include
- Files:
-
- 5 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 -
trunk/include/constants.php
r8651 r8722 28 28 29 29 define('PHPWG_THEMES_PATH', $conf['themes_dir'].'/'); 30 define('PWG_COMBINED_DIR', PWG_LOCAL_DIR.'combined/'); 30 31 31 32 // Required versions -
trunk/include/functions.inc.php
r8665 r8722 576 576 load_language('common.lang'); 577 577 trigger_action('loading_lang'); 578 load_language('lang', PHPWG_ROOT_PATH. 'local/', array('no_fallback'=>true, 'local'=>true) );578 load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, array('no_fallback'=>true, 'local'=>true) ); 579 579 $template = new Template(PHPWG_ROOT_PATH.'themes', get_default_theme()); 580 580 } -
trunk/include/functions_mail.inc.php
r8131 r8722 224 224 load_language('admin.lang', '', array('language'=>$language) ); 225 225 trigger_action('loading_lang'); 226 load_language('lang', PHPWG_ROOT_PATH. 'local/',226 load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR, 227 227 array('language'=>$language, 'no_fallback'=>true, 'local'=>true) 228 228 ); -
trunk/include/template.class.php
r8634 r8722 798 798 foreach ($smarty->get_template_vars('themes') as $theme) 799 799 { 800 $f = 'local/css/'.$theme['id'].'-rules.css';800 $f = PWG_LOCAL_DIR.'css/'.$theme['id'].'-rules.css'; 801 801 if (file_exists(PHPWG_ROOT_PATH.$f)) 802 802 { … … 804 804 } 805 805 } 806 $f = 'local/css/rules.css';806 $f = PWG_LOCAL_DIR.'css/rules.css'; 807 807 if (file_exists(PHPWG_ROOT_PATH.$f)) 808 808 { … … 1134 1134 final class FileCombiner 1135 1135 { 1136 const OUT_SUB_DIR = 'local/combined/';1136 const OUT_SUB_DIR = PWG_COMBINED_DIR; 1137 1137 private $type; // js or css 1138 1138 private $files = array();
Note: See TracChangeset
for help on using the changeset viewer.