Changeset 2986

Timestamp:

07/07/2008 02:14:23 PM (5 months ago)

Author:

Shadowhand

Message:

Merged r2985 into tags/2.1.3

Files:

• tags/2.1.3/system/helpers/feed.php (modified) (1 diff)

tags/2.1.3/system/helpers/feed.php

@@ -27 +27 @@
                 $ER = error_reporting(0);
 
-                // Allow loading by filename or raw XML string.
-                $feed = (is_file($feed) OR valid::url($feed)) ? simplexml_load_file($feed) : simplexml_load_string($feed);
+                // Allow loading by filename or raw XML string
+                $load = (is_file($feed) OR valid::url($feed)) ? 'simplexml_load_file' : 'simplexml_load_string';
+
+                // Load the feed
+                $feed = $load($feed, 'SimpleXMLElement', LIBXML_NOCDATA);
 
                 // Restore error reporting