Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/attributedef.class.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -4259,6 +4259,9 @@ public function GetMaxSize()

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(
Expand Down
3 changes: 3 additions & 0 deletions core/inlineimage.class.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ public static function OnFormCancel($sTempId): bool
*/
public static function FixUrls($sHtml)
{
// N°8681 - Ensure to have a string value
$sHtml = $sHtml ?? '';

$aNeedles = [];
$aReplacements = [];
// Find img tags with an attribute data-img-id
Expand Down