@@ -75,10 +75,10 @@ |
||
| 75 | 75 | * Try to load classes from different places. If not found in one place - try in another. |
| 76 | 76 | */ |
| 77 | 77 | if ( |
| 78 | - file_exists($file = CORE."/classes/$namespace/$class_name.php") || //Core classes |
|
| 78 | + file_exists($file = CORE."/classes/$namespace/$class_name.php") || //Core classes |
|
| 79 | 79 | file_exists($file = CORE."/thirdparty/$namespace/$class_name.php") || //Third party classes |
| 80 | - file_exists($file = CORE."/traits/$namespace/$class_name.php") || //Core traits |
|
| 81 | - file_exists($file = CORE."/drivers/$namespace/$class_name.php") || //Core drivers |
|
| 80 | + file_exists($file = CORE."/traits/$namespace/$class_name.php") || //Core traits |
|
| 81 | + file_exists($file = CORE."/drivers/$namespace/$class_name.php") || //Core drivers |
|
| 82 | 82 | file_exists($file = MODULES."/../$namespace/$class_name.php") //Classes in modules |
| 83 | 83 | ) { |
| 84 | 84 | $cache[$class] = realpath($file); |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | * Try to load classes from different places. If not found in one place - try in another. |
| 155 | 155 | */ |
| 156 | 156 | if ( |
| 157 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
| 157 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
| 158 | 158 | strlen($file = @$file_index_map[str_replace('//', '/', "core/thirdparty/$namespace/$class_name.php")]) || //Third party classes |
| 159 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
| 160 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/drivers/$namespace/$class_name.php")]) || //Core drivers |
|
| 159 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
| 160 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/drivers/$namespace/$class_name.php")]) || //Core drivers |
|
| 161 | 161 | strlen($file = @$file_index_map[str_replace('//', '/', "$namespace/$class_name.php")]) //Classes in modules |
| 162 | 162 | ) { |
| 163 | 163 | require_once "$source/fs/$file"; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | * @throws RuntimeException |
| 264 | 264 | */ |
| 265 | 265 | protected static function initialize_system_config ($cdb, $source, $site_name, $url, $admin_email, $language, $domain, $timezone, $mode) { |
| 266 | - $config = [ |
|
| 266 | + $config = [ |
|
| 267 | 267 | 'site_name' => $site_name, |
| 268 | 268 | 'url' => [$url], |
| 269 | 269 | 'admin_email' => $admin_email, |