ifhub/ifhub2
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Close off type errors in router

Browse source
This commit is contained in:
Alexander Yakovlev 2024-06-02 16:33:10 +06:00
parent a7f5784aeb
commit ebcafaf897
Signed by: oreolek
GPG key ID: 8269E24B4008E32A
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
framework/classes/engine/Router.class.php
View file

@ -243,7 +243,7 @@ class Router extends LsObject
*/
protected function GetRequestUri()
{
$sReq = preg_replace("/\/+/", '/', $_SERVER['REQUEST_URI']);
$sReq = preg_replace("/\/+/", '/', ($_SERVER['REQUEST_URI'] ?? ''));
$sReq = preg_replace("/^\/(.*)\/?$/U", '\\1', $sReq);
$sReq = preg_replace("/^(.*)\?.*$/U", '\\1', $sReq);
/**
@ -469,8 +469,8 @@ class Router extends LsObject
static public function GetFixPathWeb($sUrl, $bWithScheme = true)
{
$sResult = '';
$aPathFull = parse_url($sUrl);
$sPath = preg_replace('/^(http|https):\/\/[^\/]+/i', '', $sUrl);
$aPathFull = parse_url((string) $sUrl);
$sPath = preg_replace('/^(http|https):\/\/[^\/]+/i', '', (string) $sUrl);
if (isset($aPathFull['host'])) {
$sHost = $aPathFull['host'];
} elseif (isset($_SERVER['HTTP_HOST'])) {
@ -870,4 +870,4 @@ class Router extends LsObject
{
self::Location(self::GetPath($sLocation));
}
}
}