replace load with loadXML()

civicrm · May 2, 2017 · 80d97a8 · 80d97a8
1 parent 6498e0d
commit 80d97a8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/CRM/Case/Audit/AuditConfig.php b/CRM/Case/Audit/AuditConfig.php
@@ -61,9 +61,8 @@ public function loadConfig() {
     $this->includeRules = array();
 
     $doc = new DOMDocument();
-    $oldValue = libxml_disable_entity_loader(FALSE);
-    $load = $doc->load(dirname(__FILE__) . '/' . $this->filename);
-    libxml_disable_entity_loader($oldValue);
+    $xmlString = file_get_contents(dirname(__FILE__) . '/' . $this->filename);
+    $load = $doc->loadXML($xmlString);
     if ($load) {
       $regions = $doc->getElementsByTagName("region");
       foreach ($regions as $region) {

diff --git a/CRM/Case/XMLRepository.php b/CRM/Case/XMLRepository.php
@@ -136,9 +136,8 @@ public function retrieveFile($caseType) {
     if ($fileName && file_exists($fileName)) {
       // read xml file
       $dom = new DomDocument();
-      $oldValue = libxml_disable_entity_loader(FALSE);
-      $dom->load($fileName);
-      libxml_disable_entity_loader($oldValue);
+      $xmlString = file_get_contents($fileName);
+      $dom->loadXML($xmlString);
       $dom->xinclude();
       $fileXml = simplexml_import_dom($dom);
     }

diff --git a/CRM/Core/CodeGen/Util/Xml.php b/CRM/Core/CodeGen/Util/Xml.php
@@ -11,10 +11,9 @@ class CRM_Core_CodeGen_Util_Xml {
    * @return SimpleXMLElement|bool
    */
   public static function parse($file) {
-    $oldValue = libxml_disable_entity_loader(FALSE);
     $dom = new DomDocument();
-    $dom->load($file);
-    libxml_disable_entity_loader($oldValue);
+    $xmlString = file_get_contents($file);
+    $dom->loadXML($xmlString);
     $dom->xinclude();
     $xml = simplexml_import_dom($dom);
     return $xml;

diff --git a/CRM/Utils/Migrate/Import.php b/CRM/Utils/Migrate/Import.php
@@ -48,9 +48,8 @@ public function __construct() {
   public function run($file) {
     // read xml file
     $dom = new DomDocument();
-    $oldValue = libxml_disable_entity_loader(FALSE);
-    $load = $dom->load($file);
-    libxml_disable_entity_loader($oldValue);
+    $xmlString = file_get_contents($file);
+    $load = $dom->loadXML($xmlString);
     if (!$load) {
       throw new CRM_Core_Exception("Failed to parse XML file \"$file\"");
     }