alcetech/phast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

explicitly cast null string to empty string for PHP 8.1

Browse Source
This commit is contained in:
Michael Becker 2025-01-13 23:45:17 -05:00
parent e7fae2af25
commit 2374310056
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/phast/server/System.inc.php
View File

@ -406,7 +406,7 @@
{ {
$torepl = System::GetConfigurationValue("Application.BasePath"); $torepl = System::GetConfigurationValue("Application.BasePath");
$torepl_nontenanted = $torepl; $torepl_nontenanted = $torepl;
if (!$forceNonTenanted) if (!$forceNonTenanted)
{ {
$tenantName = System::GetTenantName(); $tenantName = System::GetTenantName();
@ -416,6 +416,9 @@
} }
} }
if ($torepl_nontenanted === null) {
$torepl_nontenanted = "";
}
$retval_nontenanted = str_replace("~", $torepl_nontenanted, $path); $retval_nontenanted = str_replace("~", $torepl_nontenanted, $path);
$physicalFilePath = System::GetApplicationPath() . $retval_nontenanted; $physicalFilePath = System::GetApplicationPath() . $retval_nontenanted;
@ -425,6 +428,10 @@
} }
else else
{ {
if ($torepl === null)
{
$torepl = "";
}
$retval = str_replace("~~", $torepl_nontenanted, $path); $retval = str_replace("~~", $torepl_nontenanted, $path);
$retval = str_replace("~", $torepl, $retval); $retval = str_replace("~", $torepl, $retval);
} }