@@ -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/engines/$namespace/$class_name.php")]) || //Core engines |
|
| 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/engines/$namespace/$class_name.php")]) || //Core engines |
|
| 161 | 161 | strlen($file = @$file_index_map[str_replace('//', '/', "components/$namespace/$class_name.php")]) //Classes in modules and plugins |
| 162 | 162 | ) { |
| 163 | 163 | /** @noinspection UntrustedInclusionInspection */ |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | * @throws Exception |
| 280 | 280 | */ |
| 281 | 281 | protected static function initialize_system_config ($cdb, $source, $site_name, $url, $admin_email, $language, $domain, $timezone, $mode) { |
| 282 | - $config = [ |
|
| 282 | + $config = [ |
|
| 283 | 283 | 'name' => $site_name, |
| 284 | 284 | 'url' => [$url], |
| 285 | 285 | 'admin_email' => $admin_email, |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | if (isset($_POST['site_url'])) { |
| 121 | 121 | $url = $_POST['site_url']; |
| 122 | 122 | } else { |
| 123 | - $https = @$_SERVER['HTTPS'] ? $_SERVER['HTTPS'] !== 'off' : ( |
|
| 123 | + $https = @$_SERVER['HTTPS'] ? $_SERVER['HTTPS'] !== 'off' : ( |
|
| 124 | 124 | @$_SERVER['REQUEST_SCHEME'] === 'https' || |
| 125 | 125 | @$_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' |
| 126 | 126 | ); |