[jan] Fix loading of configuration screen with basedir restrictions o…

…r libxml entity loading disabled (Bug #13025).
horde · Mar 24, 2014 · 34647e6 · 34647e6
1 parent a5f61b0
commit 34647e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
@@ -184,7 +184,7 @@ public function readXMLConfig($custom_conf = null)
 
         /* Load the DOM object. */
         $dom = new DOMDocument();
-        $dom->load($path . '/conf.xml');
+        $dom->loadXML(file_get_contents($path . '/conf.xml'));
 
         /* Check if there is a CVS/Git version tag and store it. */
         $node = $dom->firstChild;

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,6 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [jan] Fix loading of configuration screen with basedir restrictions or libxml entity loading disabled (Bug #13025).
 * [mms] The location of dynamically served static files is now configurable (Request #13070).
 * [jan] Update Korean translation (Deokgon Kim &lt;dgkim@dgkim.net&gt;).
 * [mms] Support new configuration options for history storage.
@@ -3357,6 +3358,7 @@
    <date>2014-02-13</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [jan] Fix loading of configuration screen with basedir restrictions or libxml entity loading disabled (Bug #13025).
 * [mms] The location of dynamically served static files is now configurable (Request #13070).
 * [jan] Update Korean translation (Deokgon Kim &lt;dgkim@dgkim.net&gt;).
 * [mms] Support new configuration options for history storage.