From 220f5b7f0e3a316ef9949632681ca8232b421d1b Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 19 Feb 2021 16:25:24 +0000
Subject: [PATCH] wait #4282 @1.5

---
 inc/ws/Util/class.ws.pdf.convert.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/inc/ws/Util/class.ws.pdf.convert.php b/inc/ws/Util/class.ws.pdf.convert.php
index 667174a15..3e0545050 100644
--- a/inc/ws/Util/class.ws.pdf.convert.php
+++ b/inc/ws/Util/class.ws.pdf.convert.php
@@ -115,17 +115,17 @@ class wsPDFConvert
         $xpath->registerNamespace('svg', 'http://www.w3.org/2000/svg');
         $xpath->registerNamespace('xlink', 'http://www.w3.org/1999/xlink');
         $xpath->registerNamespace("php", "http://php.net/xpath");
-        $xpath->registerPhpFunctions('has_not_text');
         $toDelete = array(
-            '//svg:defs/svg:clipPath',
-            '//svg:defs/svg:image',
-            '//svg:defs/svg:path',
-            '//svg:defs/svg:pattern',
+//            '//svg:defs/svg:clipPath',
+//            '//svg:defs/svg:image',
+//            '//svg:defs/svg:path',
+//            '//svg:defs/svg:pattern',
             '//svg:defs/svg:g[starts-with(@id, "surface")]//svg:path',
-            '/svg:svg/svg:g//svg:path',
-            '/svg:svg/svg:g//svg:rect',
-            '//svg:filter',
-            '//svg:use[starts-with(@xlink:href, "#image")]'
+            '//svg:defs/svg:g[starts-with(@id, "surface")]//svg:rect',
+            '/svg:svg/svg:g[@id="surface1"]//svg:path',
+            '/svg:svg/svg:g[@id="surface1"]//svg:rect',
+            '/svg:svg/svg:g[@id="surface1"]//svg:filter',
+            '/svg:svg/svg:g[@id="surface1"]//svg:use[starts-with(@xlink:href, "#image")]'
         );
 
         //global $svglog;
@@ -252,9 +252,9 @@ class wsPDFConvert
                 $pnmtopng->execute();
             }
             unlink($tmp);
-        }else{
+        } else {
             $pdftoppm->debug();
-            echo $pdftoppm->command.':'.$pdftoppm->output;
+            echo $pdftoppm->command . ':' . $pdftoppm->output;
             exit;
         }
     }
-- 
2.39.5