Merge pull request #10264 from jitendrapurohit/CRM-20171

CRM-20171: Use loadXML() instead of load() for reading xml files.
civicrm · May 4, 2017 · bbf0d15 · bbf0d15
2 parents 58bf7ae + f9857c5
commit bbf0d15
Show file tree

Hide file tree

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

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

diff --git a/CRM/Core/CodeGen/Util/Xml.php b/CRM/Core/CodeGen/Util/Xml.php
@@ -12,7 +12,9 @@ class CRM_Core_CodeGen_Util_Xml {
    */
   public static function parse($file) {
     $dom = new DomDocument();
-    $dom->load($file);
+    $xmlString = file_get_contents($file);
+    $dom->loadXML($xmlString);
+    $dom->documentURI = $file;
     $dom->xinclude();
     $xml = simplexml_import_dom($dom);
     return $xml;

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