[jan] Fix loading of local files with basedir restrictions or libxml …

…entity loading disabled.
horde · Mar 24, 2014 · b1eb268 · b1eb268
1 parent 34647e6
commit b1eb268
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/Feed/lib/Horde/Feed.php b/framework/Feed/lib/Horde/Feed.php
@@ -132,7 +132,7 @@ public static function readFile($filename)
         $doc = new DOMDocument;
         $doc->recover = true;
         $filename = urlencode($filename);
-        $loaded = $doc->load($filename);
+        $loaded = $doc->loadXML(file_get_contents($filename));
         if (!$loaded) {
             $loaded = $doc->loadHTMLFile($filename);
             if (!$loaded) {

diff --git a/framework/Feed/package.xml b/framework/Feed/package.xml
@@ -22,7 +22,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [jan] Fix loading of local files with basedir restrictions or libxml entity loading disabled.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -705,7 +705,7 @@
    <date>2012-11-19</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [jan] Fix loading of local files with basedir restrictions or libxml entity loading disabled.
    </notes>
   </release>
  </changelog>