From 6498e0deb428bab135fdf50a3733ff50ae500bfe Mon Sep 17 00:00:00 2001
From: Jitendra Purohit <jitendra@fuzion.co.nz>
Date: Thu, 27 Apr 2017 16:40:42 +0530
Subject: [PATCH] CRM-20171: avoid warning while loading external entity

---
 CRM/Case/Audit/AuditConfig.php | 5 ++++-
 CRM/Case/XMLRepository.php     | 2 ++
 CRM/Core/CodeGen/Util/Xml.php  | 2 ++
 CRM/Utils/Migrate/Import.php   | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CRM/Case/Audit/AuditConfig.php b/CRM/Case/Audit/AuditConfig.php
index 14bc772ff1..3fedba0678 100644
--- a/CRM/Case/Audit/AuditConfig.php
+++ b/CRM/Case/Audit/AuditConfig.php
@@ -61,7 +61,10 @@ class CRM_Case_Audit_AuditConfig {
     $this->includeRules = array();
 
     $doc = new DOMDocument();
-    if ($doc->load(dirname(__FILE__) . '/' . $this->filename)) {
+    $oldValue = libxml_disable_entity_loader(FALSE);
+    $load = $doc->load(dirname(__FILE__) . '/' . $this->filename);
+    libxml_disable_entity_loader($oldValue);
+    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
index 89dcce5ce4..34fc42da55 100644
--- a/CRM/Case/XMLRepository.php
+++ b/CRM/Case/XMLRepository.php
@@ -136,7 +136,9 @@ class CRM_Case_XMLRepository {
     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);
       $dom->xinclude();
       $fileXml = simplexml_import_dom($dom);
     }
diff --git a/CRM/Core/CodeGen/Util/Xml.php b/CRM/Core/CodeGen/Util/Xml.php
index 4711fdc472..aa3335581e 100644
--- a/CRM/Core/CodeGen/Util/Xml.php
+++ b/CRM/Core/CodeGen/Util/Xml.php
@@ -11,8 +11,10 @@ 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);
     $dom->xinclude();
     $xml = simplexml_import_dom($dom);
     return $xml;
diff --git a/CRM/Utils/Migrate/Import.php b/CRM/Utils/Migrate/Import.php
index 311fb4516d..29397a960f 100644
--- a/CRM/Utils/Migrate/Import.php
+++ b/CRM/Utils/Migrate/Import.php
@@ -48,7 +48,10 @@ class CRM_Utils_Migrate_Import {
   public function run($file) {
     // read xml file
     $dom = new DomDocument();
-    if (!$dom->load($file)) {
+    $oldValue = libxml_disable_entity_loader(FALSE);
+    $load = $dom->load($file);
+    libxml_disable_entity_loader($oldValue);
+    if (!$load) {
       throw new CRM_Core_Exception("Failed to parse XML file \"$file\"");
     }
     $dom->xinclude();
-- 
2.25.1