Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1585 from seamuslee001/libxml_improve 

Ensure that entity_loader disable variable is re-set back to the orig…
This commit is contained in:
troosan 2019-03-31 13:19:25 +02:00 committed by GitHub
parent 2d2fe52b7a 607378b8fb
commit 6e4f18c2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/PhpWord/Shared/Html.php
View File

@ -72,7 +72,7 @@ class Html
} }
// Load DOM // Load DOM
libxml_disable_entity_loader(true); $orignalLibEntityLoader = libxml_disable_entity_loader(true);
$dom = new \DOMDocument(); $dom = new \DOMDocument();
$dom->preserveWhiteSpace = $preserveWhiteSpace; $dom->preserveWhiteSpace = $preserveWhiteSpace;
$dom->loadXML($html); $dom->loadXML($html);
@ -80,6 +80,7 @@ class Html
$node = $dom->getElementsByTagName('body'); $node = $dom->getElementsByTagName('body');
self::parseNode($node->item(0), $element); self::parseNode($node->item(0), $element);
libxml_disable_entity_loader($orignalLibEntityLoader);
} }
/** /**

3
src/PhpWord/TemplateProcessor.php
View File

@ -170,7 +170,7 @@ class TemplateProcessor
*/ */
protected function transformSingleXml($xml, $xsltProcessor) protected function transformSingleXml($xml, $xsltProcessor)
{ {
libxml_disable_entity_loader(true); $orignalLibEntityLoader = libxml_disable_entity_loader(true);
$domDocument = new \DOMDocument(); $domDocument = new \DOMDocument();
if (false === $domDocument->loadXML($xml)) { if (false === $domDocument->loadXML($xml)) {
throw new Exception('Could not load the given XML document.'); throw new Exception('Could not load the given XML document.');
@ -180,6 +180,7 @@ class TemplateProcessor
if (false === $transformedXml) { if (false === $transformedXml) {
throw new Exception('Could not transform the given XML document.'); throw new Exception('Could not transform the given XML document.');
} }
libxml_disable_entity_loader($orignalLibEntityLoader);
return $transformedXml; return $transformedXml;
} }

4
tests/PhpWord/_includes/XmlDocument.php
View File

@ -76,10 +76,10 @@ class XmlDocument
$this->file = $file; $this->file = $file;
$file = $this->path . '/' . $file; $file = $this->path . '/' . $file;
libxml_disable_entity_loader(false); $orignalLibEntityLoader = libxml_disable_entity_loader(false);
$this->dom = new \DOMDocument(); $this->dom = new \DOMDocument();
$this->dom->load($file); $this->dom->load($file);
libxml_disable_entity_loader(true); libxml_disable_entity_loader($orignalLibEntityLoader);
return $this->dom; return $this->dom;
} }