N°4517 - PHP 8.1: Fix trim() called with null value

This commit is contained in:
Molkobain
2022-07-28 11:39:39 +02:00
parent dfd0406160
commit 8c27476d2a

View File

@@ -3000,7 +3000,7 @@ EOF;
*/
protected function CompileLogo($oBrandingNode, $sTempTargetDir, $sFinalTargetDir, $sNodeName, $sTargetFile)
{
$sIcon = trim($oBrandingNode->GetChildText($sNodeName));
$sIcon = trim($oBrandingNode->GetChildText($sNodeName) ?? '');
if (strlen($sIcon) > 0) {
$sSourceFile = $sTempTargetDir.'/'.$sIcon;
$aIconName=explode(".", $sIcon);
@@ -3635,7 +3635,7 @@ EOF;
{
@unlink($sFilename);
}
$ret = file_put_contents($sFilename, $sContent, $flags);
$ret = file_put_contents($sFilename, $sContent, $flags ?? 0);
if ($ret === false)
{
$iLen = strlen($sContent);