WordPress 4.7

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

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index 7759003c65c642ec5a40dc95e29a2e728c1a7324..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.
@@ -55,17 +55,18 @@ class MagpieRSS {
 
        var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
 
-       function MagpieRSS ($source) {
+       /**
+        * PHP5 constructor.
+        */
+       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;
 
@@ -97,6 +98,13 @@ class MagpieRSS {
                $this->normalize();
        }
 
+       /**
+        * PHP4 constructor.
+        */
+       public function MagpieRSS( $source ) {
+               self::__construct( $source );
+       }
+
        function feed_start_element($p, $element, &$attrs) {
                $el = $element = strtolower($element);
                $attrs = array_change_key_case($attrs, CASE_LOWER);
@@ -104,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;
@@ -579,8 +587,8 @@ function _fetch_remote_file($url, $headers = "" ) {
  * @package External
  * @subpackage MagpieRSS
  *
- * @param unknown_type $resp
- * @return unknown
+ * @param array $resp
+ * @return MagpieRSS|bool
  */
 function _response_to_rss ($resp) {
        $rss = new MagpieRSS( $resp->results );
@@ -589,7 +597,7 @@ function _response_to_rss ($resp) {
        if ( $rss && (!isset($rss->ERROR) || !$rss->ERROR) ) {
 
                // find Etag, and Last-Modified
-               foreach( (array) $resp->headers as $h) {
+               foreach ( (array) $resp->headers as $h) {
                        // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
                        if (strpos($h, ": ")) {
                                list($field, $val) = explode(": ", $h, 2);
@@ -709,7 +717,10 @@ class RSSCache {
        var $MAX_AGE    = 43200;                // when are files stale, default twelve hours
        var $ERROR              = '';                   // accumulate error messages
 
-       function RSSCache ($base='', $age='') {
+       /**
+        * PHP5 constructor.
+        */
+       function __construct( $base = '', $age = '' ) {
                $this->BASE_CACHE = WP_CONTENT_DIR . '/cache';
                if ( $base ) {
                        $this->BASE_CACHE = $base;
@@ -720,10 +731,17 @@ class RSSCache {
 
        }
 
+       /**
+        * PHP4 constructor.
+        */
+       public function RSSCache( $base = '', $age = '' ) {
+               self::__construct( $base, $age );
+       }
+
 /*=======================================================================*\
        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) {
@@ -737,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) {
@@ -758,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 ) {
@@ -791,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) {