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

N°4517 - PHP 8.1 compatibility: Fix deprecated call str_replace with null value

Browse Source
This commit is contained in:
Benjamin Dalsass
2022-06-30 15:03:12 +02:00
parent 0b2510f6cc
commit ab40b1b556
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/attributedef.class.inc.php
View File

@@ -4179,20 +4179,21 @@ class AttributeText extends AttributeString
public function GetEditValue($sValue, $oHostObj = null) public function GetEditValue($sValue, $oHostObj = null)
{ {
if ($this->GetFormat() == 'text') // N°4517 - PHP 8.1 compatibility: str_replace call with null cause deprecated message
{ if ($sValue == null) {
if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER)) return '';
{ }
foreach($aAllMatches as $iPos => $aMatches)
{ if ($this->GetFormat() == 'text') {
if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER)) {
foreach ($aAllMatches as $iPos => $aMatches) {
$sClass = trim($aMatches[1]); $sClass = trim($aMatches[1]);
$sName = trim($aMatches[2]); $sName = trim($aMatches[2]);
$sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null; $sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null;
if (MetaModel::IsValidClass($sClass)) if (MetaModel::IsValidClass($sClass)) {
{
$sClassLabel = MetaModel::GetName($sClass); $sClassLabel = MetaModel::GetName($sClass);
$sReplacement = "[[$sClassLabel:$sName" . (!empty($sLabel) ? " | $sLabel" : "") . "]]"; $sReplacement = "[[$sClassLabel:$sName".(!empty($sLabel) ? " | $sLabel" : "")."]]";
$sValue = str_replace($aMatches[0], $sReplacement, $sValue); $sValue = str_replace($aMatches[0], $sReplacement, $sValue);
} }
} }
@@ -4229,31 +4230,30 @@ class AttributeText extends AttributeString
public function MakeRealValue($proposedValue, $oHostObj) public function MakeRealValue($proposedValue, $oHostObj)
{ {
$sValue = $proposedValue; $sValue = $proposedValue;
switch ($this->GetFormat())
{ if ($sValue == null) {
return null;
}
switch ($this->GetFormat()) {
case 'html': case 'html':
if (($sValue !== null) && ($sValue !== '')) if (($sValue !== null) && ($sValue !== '')) {
{
$sValue = HTMLSanitizer::Sanitize($sValue); $sValue = HTMLSanitizer::Sanitize($sValue);
} }
break; break;
case 'text': case 'text':
default: default:
if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER)) if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER)) {
{ foreach ($aAllMatches as $iPos => $aMatches) {
foreach($aAllMatches as $iPos => $aMatches)
{
$sClassLabel = trim($aMatches[1]); $sClassLabel = trim($aMatches[1]);
$sName = trim($aMatches[2]); $sName = trim($aMatches[2]);
$sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null; $sLabel = (!empty($aMatches[4])) ? trim($aMatches[4]) : null;
if (!MetaModel::IsValidClass($sClassLabel)) if (!MetaModel::IsValidClass($sClassLabel)) {
{
$sClass = MetaModel::GetClassFromLabel($sClassLabel); $sClass = MetaModel::GetClassFromLabel($sClassLabel);
if ($sClass) if ($sClass) {
{ $sReplacement = "[[$sClassLabel:$sName".(!empty($sLabel) ? " | $sLabel" : "")."]]";
$sReplacement = "[[$sClassLabel:$sName" . (!empty($sLabel) ? " | $sLabel" : "") . "]]";
$sValue = str_replace($aMatches[0], $sReplacement, $sValue); $sValue = str_replace($aMatches[0], $sReplacement, $sValue);
} }
} }