From d06fee801246aef37dd78af46290f651702a89f7 Mon Sep 17 00:00:00 2001 From: Jonas Nutz Date: Mon, 1 Oct 2018 13:48:27 +0200 Subject: [PATCH 1/2] Fix unsupported operand types error when codepoints arrays are merged --- include/tcpdf_fonts.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/tcpdf_fonts.php b/include/tcpdf_fonts.php index 211a236..162a28d 100644 --- a/include/tcpdf_fonts.php +++ b/include/tcpdf_fonts.php @@ -2003,7 +2003,10 @@ class TCPDF_FONTS { $chars = str_split($str); $carr = array_map('ord', $chars); } - $currentfont['subsetchars'] += array_fill_keys($carr, true); + if (is_array($currentfont['subsetchars']) && is_array($carr)) + $currentfont['subsetchars'] += array_fill_keys($carr, true); + else + array_merge($currentfont['subsetchars'], $carr); return $carr; } From b9b5a0b77f1e660e1ff60d9534f8a43da592e6be Mon Sep 17 00:00:00 2001 From: Jonas Nutz Date: Fri, 5 Oct 2018 13:04:08 +0200 Subject: [PATCH 2/2] Fix unsupported operand types error when codepoints arrays are merged - corrected assignment of resulting array --- include/tcpdf_fonts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/tcpdf_fonts.php b/include/tcpdf_fonts.php index 162a28d..459aa1a 100644 --- a/include/tcpdf_fonts.php +++ b/include/tcpdf_fonts.php @@ -2006,7 +2006,7 @@ class TCPDF_FONTS { if (is_array($currentfont['subsetchars']) && is_array($carr)) $currentfont['subsetchars'] += array_fill_keys($carr, true); else - array_merge($currentfont['subsetchars'], $carr); + $currentfont['subsetchars'] = array_merge($currentfont['subsetchars'], $carr); return $carr; }