WordPress 4.7

[autoinstalls/wordpress.git] / wp-includes / rss.php

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index 548ccf23498742afea940138f8f2f8bd2072aba7..208ca720042d0497f333966d49144275f66aa62b 100644 (file)
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -16,7 +16,7 @@
 /**
  * Deprecated. Use SimplePie (class-simplepie.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/class-simplepie.php' );
+_deprecated_file( basename( __FILE__ ), '3.0.0', WPINC . '/class-simplepie.php' );
 
 /**
  * Fires before MagpieRSS is loaded, to optionally replace it.
@@ -60,15 +60,13 @@ class MagpieRSS {
         */
        function __construct( $source ) {
 
-               # if PHP xml isn't compiled in, die
+               # Check if PHP xml isn't compiled
                #
-               if ( !function_exists('xml_parser_create') )
-                       trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
-
-               $parser = @xml_parser_create();
+               if ( ! function_exists('xml_parser_create') ) {
+                       return trigger_error( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." );
+               }
 
-               if ( !is_resource($parser) )
-                       trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+               $parser = xml_parser_create();
 
                $this->parser = $parser;
 
@@ -114,7 +112,7 @@ class MagpieRSS {
                // check for a namespace, and split if found
                $ns     = false;
                if ( strpos( $element, ':' ) ) {
-                       list($ns, $el) = split( ':', $element, 2);
+                       list($ns, $el) = explode( ':', $element, 2);
                }
                if ( $ns and $ns != 'rdf' ) {
                        $this->current_namespace = $ns;
@@ -743,7 +741,7 @@ class RSSCache {
 /*=======================================================================*\
        Function:       set
        Purpose:        add an item to the cache, keyed on url
-       Input:          url from wich the rss file was fetched
+       Input:          url from which the rss file was fetched
        Output:         true on success
 \*=======================================================================*/
        function set ($url, $rss) {
@@ -757,7 +755,7 @@ class RSSCache {
 /*=======================================================================*\
        Function:       get
        Purpose:        fetch an item from the cache
-       Input:          url from wich the rss file was fetched
+       Input:          url from which the rss file was fetched
        Output:         cached object on HIT, false on MISS
 \*=======================================================================*/
        function get ($url) {
@@ -778,7 +776,7 @@ class RSSCache {
        Function:       check_cache
        Purpose:        check a url for membership in the cache
                                and whether the object is older then MAX_AGE (ie. STALE)
-       Input:          url from wich the rss file was fetched
+       Input:          url from which the rss file was fetched
        Output:         cached object on HIT, false on MISS
 \*=======================================================================*/
        function check_cache ( $url ) {
@@ -811,7 +809,7 @@ class RSSCache {
 /*=======================================================================*\
        Function:       file_name
        Purpose:        map url to location in cache
-       Input:          url from wich the rss file was fetched
+       Input:          url from which the rss file was fetched
        Output:         a file name
 \*=======================================================================*/
        function file_name ($url) {