From a7f1aa1cd2fb54fda459961b9ed173f34dee4550 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Fri, 7 Feb 2020 14:46:48 +1100 Subject: [PATCH] [REF] Remove patch from dompdf cleanup script that is no longer needed --- tools/scripts/composer/dompdf-cleanup.sh | 4 --- .../dompdf_no_block_level_parent_fix.patch | 33 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch diff --git a/tools/scripts/composer/dompdf-cleanup.sh b/tools/scripts/composer/dompdf-cleanup.sh index bfe79d6ebd..9ee2e377e2 100755 --- a/tools/scripts/composer/dompdf-cleanup.sh +++ b/tools/scripts/composer/dompdf-cleanup.sh @@ -129,7 +129,3 @@ make_font_readme > vendor/dompdf/dompdf/lib/fonts/README.DejaVuFonts.txt # Remove debug_print_backtrace(), which can leak system details. Put backtrace in log. simple_replace vendor/dompdf/dompdf/lib/html5lib/TreeBuilder.php 'debug_print_backtrace();' 'CRM_Core_Error::backtrace("backTrace", TRUE);' - -if ! grep -q 'CRM-21395' vendor/dompdf/dompdf/src/Dompdf.php; then - patch vendor/dompdf/dompdf/src/Dompdf.php < tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch -fi diff --git a/tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch b/tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch deleted file mode 100644 index 29dd309d4a..0000000000 --- a/tools/scripts/composer/patches/dompdf_no_block_level_parent_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 226061647fc7e30f99855c8b481a88f5d78f455b Mon Sep 17 00:00:00 2001 -From: Ed Preston -Date: Mon, 9 Oct 2017 20:29:46 +1100 -Subject: [PATCH] Fix: Uncaught Dompdf\Exception: No block-level parent found. - Not good - -Fatal error: Uncaught Dompdf\Exception: No block-level parent found. -Not good ---- - src/Dompdf.php | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/Dompdf.php b/src/Dompdf.php -index 40329063..bfb1c2b1 100644 ---- a/src/Dompdf.php -+++ b/src/Dompdf.php -@@ -490,6 +490,16 @@ public function loadHtml($str, $encoding = 'UTF-8') - $doc->loadHTML($str); - $doc->encoding = $encoding; - -+ // Remove #text children nodes in nodes that shouldn't have #CRM-21395 -+ $tag_names = array("html", "table", "tbody", "thead", "tfoot", "tr"); -+ foreach ($tag_names as $tag_name) { -+ $nodes = $doc->getElementsByTagName($tag_name); -+ -+ foreach ($nodes as $node) { -+ self::removeTextNodes($node); -+ } -+ } -+ - // If some text is before the doctype, we are in quirksmode - if (preg_match("/^(.+)