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

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source 
# Conflicts:
#	core/attributedef.class.inc.php
This commit is contained in:
Molkobain
2026-02-17 20:46:54 +01:00
parent b085147f23 3b62597092
commit a5296e11e1
7 changed files with 131 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/Core/AttributeDefinition/AttributeText.php
View File

@@ -97,6 +97,9 @@ class AttributeText extends AttributeString
public static function RenderWikiHtml($sText, $bWikiOnly = false)
{
// N°8681 - Ensure to have a string value
$sText = $sText ?? '';
if (!$bWikiOnly) {
$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
if (preg_match_all(