File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -283,16 +283,24 @@ protected function urlFromGlobal(): string
283
283
{
284
284
$ urlSegments = [];
285
285
$ urlSegments ['scheme ' ] = !empty ($ _SERVER ['HTTPS ' ]) && strcasecmp ($ _SERVER ['HTTPS ' ], 'off ' ) ? 'https ' : 'http ' ;
286
- $ urlSegments ['host ' ] = strtolower ($ _SERVER ['HTTP_HOST ' ] ?? '' );
286
+ if (isset ($ _SERVER ['HTTP_HOST ' ])) {
287
+ $ urlSegments ['host ' ] = strtolower ($ _SERVER ['HTTP_HOST ' ]);
288
+ }
287
289
288
290
$ requestUrl = $ _SERVER ['REQUEST_URI ' ] ?? '/ ' ;
289
291
$ requestUrl = preg_replace ('#^\w++://[^/]++# ' , '' , $ requestUrl );
290
292
$ tmp = explode ('? ' , $ requestUrl , 2 );
291
293
$ urlSegments ['path ' ] = $ tmp [0 ];
292
- $ urlSegments ['query ' ] = ($ tmp [1 ] ?? '' );
294
+ if (isset ($ tmp [1 ])) {
295
+ $ urlSegments ['query ' ] = $ tmp [1 ];
296
+ }
293
297
294
- $ urlSegments ['user ' ] = ($ _SERVER ['PHP_AUTH_USER ' ] ?? '' );
295
- $ urlSegments ['pass ' ] = ($ _SERVER ['PHP_AUTH_PW ' ] ?? '' );
298
+ if (isset ($ _SERVER ['PHP_AUTH_USER ' ])) {
299
+ $ urlSegments ['user ' ] = $ _SERVER ['PHP_AUTH_USER ' ];
300
+ }
301
+ if (isset ($ _SERVER ['PHP_AUTH_PW ' ])) {
302
+ $ urlSegments ['pass ' ] = $ _SERVER ['PHP_AUTH_PW ' ];
303
+ }
296
304
297
305
return $ this ->buildUrl ($ urlSegments );
298
306
}
You can’t perform that action at this time.
0 commit comments