composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 18:18:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°5388 - PHP 8.2: Fix dynamic properties that were actually just case-sensitive typos

Browse Source
This commit is contained in:
Molkobain
2023-01-27 17:57:50 +01:00
parent 6fb00cbbf3
commit f48df74933
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/htmlsanitizer.class.inc.php
View File

@@ -134,7 +134,7 @@ abstract class DOMSanitizer extends HTMLSanitizer
public function DoSanitize($sHTML)
{
$this->oDoc = new DOMDocument();
$this->oDoc->preserveWhitespace = true;
$this->oDoc->preserveWhiteSpace = true;
// MS outlook implements empty lines by the mean of <p><o:p></o:p></p>
// We have to transform that into <p><br></p> (which is how Thunderbird implements empty lines)
@@ -402,7 +402,7 @@ class HTMLDOMSanitizer extends DOMSanitizer
public function LoadDoc($sHTML)
{
@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified
$this->oDoc->preserveWhitespace = true;
$this->oDoc->preserveWhiteSpace = true;
}
public function PrintDoc()

10
core/templatestring.class.inc.php
View File

@@ -42,7 +42,7 @@ class TemplateStringPlaceholder
public function __construct($sToken)
{
$this->sToken = $sToken;
$this->sAttcode = '';
$this->sAttCode = '';
$this->sFunction = '';
$this->sParamName = '';
$this->bIsValid = false; // Validity may be false in general, but it can work anyway (thanks to specialization) when rendering
@@ -90,9 +90,9 @@ class TemplateString
$oPlaceholder->sFunction = '';
$oPlaceholder->sParamName = $sParamName;
$sAttcode = substr($sPlaceholder, strlen($sParamPrefix));
$oPlaceholder->sAttcode = $sAttcode;
$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttcode, true /* extended */);
$sAttCode = substr($sPlaceholder, strlen($sParamPrefix));
$oPlaceholder->sAttCode = $sAttCode;
$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttCode, true /* extended */);
}
}
@@ -164,7 +164,7 @@ class TemplateString
$oRef = $aParamValues[$oPlaceholder->sParamName];
try
{
$value = $oRef->Get($oPlaceholder->sAttcode);
$value = $oRef->Get($oPlaceholder->sAttCode);
$aSearch[] = '$'.$oPlaceholder->sToken.'$';
$aReplace[] = $value;
$oPlaceholder->bIsValid = true;

2
sources/Core/Email/EmailLaminas.php
View File

@@ -250,7 +250,7 @@ class EMailLaminas extends Email
protected function EmbedInlineImages(string &$sBody)
{
$oDOMDoc = new DOMDocument();
$oDOMDoc->preserveWhitespace = true;
$oDOMDoc->preserveWhiteSpace = true;
@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sBody); // For loading HTML chunks where the character set is not specified
$oXPath = new DOMXPath($oDOMDoc);