Changeset 2985

Show
Ignore:
Timestamp:
07/07/2008 02:13:27 PM (5 months ago)
Author:
Shadowhand
Message:

Fixing #637, thanks Nodren.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/system/helpers/feed.php

    r2954 r2985  
    2727                $ER = error_reporting(0); 
    2828 
    29                 // Allow loading by filename or raw XML string. 
    30                 $feed = (is_file($feed) OR valid::url($feed)) ? simplexml_load_file($feed) : simplexml_load_string($feed); 
     29                // Allow loading by filename or raw XML string 
     30                $load = (is_file($feed) OR valid::url($feed)) ? 'simplexml_load_file' : 'simplexml_load_string'; 
     31 
     32                // Load the feed 
     33                $feed = $load($feed, 'SimpleXMLElement', LIBXML_NOCDATA); 
    3134 
    3235                // Restore error reporting