From ac7faf60366da500411d795ece2745905edfab32 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 4 Oct 2021 13:02:34 +0200 Subject: [PATCH] fix PHP 8.0 error: count(): Argument #1 ($value) must be of type Countable|array, string given --- api/src/Storage/Merge.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 3046125d15..55c3f34b5d 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -811,6 +811,7 @@ abstract class Merge */ public function &merge_string($_content,$ids,&$err,$mimetype,array $fix=null,$charset=null) { + $ids = empty($ids) ? [] : (array)$ids; $matches = null; if ($mimetype == 'application/xml' && preg_match('/'.preg_quote('', '/').'/',substr($_content,0,200),$matches)) @@ -941,7 +942,7 @@ abstract class Merge if ($contentrepeat) $content = $contentrepeat; //content to repeat if ($lableprint) $content = $Labelrepeat; - // generate replacements; if exeption is thrown, catch it set error message and return false + // generate replacements; if exception is thrown, catch it set error message and return false try { if(!($replacements = $this->get_replacements($id,$content)))