Wordpress 3.7

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

diff --git a/wp-includes/rss.php b/wp-includes/rss.php
index f23730d0eef8c7ce2a440b91963abb38db082ce9..ab6ead0f2ca8e1e3c54a87bd722b94e75744f217 100644 (file)
--- a/wp-includes/rss.php
+++ b/wp-includes/rss.php
@@ -10,6 +10,7 @@
  *
  * @package External
  * @subpackage MagpieRSS
  *
  * @package External
  * @subpackage MagpieRSS

+ * @deprecated 3.0.0 Use SimplePie instead.

  */
 
 /**
  */
 
 /**


@@ -17,10 +18,13 @@
  */
 _deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/class-simplepie.php' );
 
  */
 _deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/class-simplepie.php' );
 

-/*
- * Hook to use another RSS object instead of MagpieRSS
+/**
+ * Fires before MagpieRSS is loaded, to optionally replace it.
+ *
+ * @since 2.3.0
+ * @deprecated 3.0.0

  */
  */

-do_action('load_feed_engine');
+do_action( 'load_feed_engine' );

 
 /** RSS feed constant. */
 define('RSS', 'RSS');
 
 /** RSS feed constant. */
 define('RSS', 'RSS');


@@ -63,7 +67,6 @@ class MagpieRSS {
                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");
 
                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");
 

-

                $this->parser = $parser;
 
                # pass in parser, and a reference to this object
                $this->parser = $parser;
 
                # pass in parser, and a reference to this object


@@ -167,7 +170,6 @@ class MagpieRSS {
 
                        $this->incontent = $el;
 
 
                        $this->incontent = $el;
 

-

                }
 
                // if inside an Atom content construct (e.g. content or summary) field treat tags as text
                }
 
                // if inside an Atom content construct (e.g. content or summary) field treat tags as text


@@ -206,8 +208,6 @@ class MagpieRSS {
                }
        }
 
                }
        }
 

-
-

        function feed_cdata ($p, $text) {
 
                if ($this->feed_type == ATOM and $this->incontent)
        function feed_cdata ($p, $text) {
 
                if ($this->feed_type == ATOM and $this->incontent)


@@ -426,7 +426,7 @@ function fetch_rss ($url) {
        else {
                // Flow
                // 1. check cache
        else {
                // Flow
                // 1. check cache

-               // 2. if there is a hit, make sure its fresh
+               // 2. if there is a hit, make sure it's fresh

                // 3. if cached obj fails freshness check, fetch remote
                // 4. if remote fails, return stale object, or error
 
                // 3. if cached obj fails freshness check, fetch remote
                // 4. if remote fails, return stale object, or error
 


@@ -436,7 +436,6 @@ function fetch_rss ($url) {
                        debug($cache->ERROR, E_USER_WARNING);
                }
 
                        debug($cache->ERROR, E_USER_WARNING);
                }
 

-

                $cache_status    = 0;           // response of check_cache
                $request_headers = array(); // HTTP headers to send with fetch
                $rss                     = 0;           // parsed RSS object
                $cache_status    = 0;           // response of check_cache
                $request_headers = array(); // HTTP headers to send with fetch
                $rss                     = 0;           // parsed RSS object


@@ -541,7 +540,7 @@ endif;
  * @return Snoopy style response
  */
 function _fetch_remote_file($url, $headers = "" ) {
  * @return Snoopy style response
  */
 function _fetch_remote_file($url, $headers = "" ) {

-       $resp = wp_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
+       $resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );

        if ( is_wp_error($resp) ) {
                $error = array_shift($resp->errors);
 
        if ( is_wp_error($resp) ) {
                $error = array_shift($resp->errors);
 


@@ -555,7 +554,7 @@ function _fetch_remote_file($url, $headers = "" ) {
        // Snoopy returns headers unprocessed.
        // Also note, WP_HTTP lowercases all keys, Snoopy did not.
        $return_headers = array();
        // Snoopy returns headers unprocessed.
        // Also note, WP_HTTP lowercases all keys, Snoopy did not.
        $return_headers = array();

-       foreach ( $resp['headers'] as $key => $value ) {
+       foreach ( wp_remote_retrieve_headers( $resp ) as $key => $value ) {

                if ( !is_array($value) ) {
                        $return_headers[] = "$key: $value";
                } else {
                if ( !is_array($value) ) {
                        $return_headers[] = "$key: $value";
                } else {


@@ -565,10 +564,10 @@ function _fetch_remote_file($url, $headers = "" ) {
        }
 
        $response = new stdClass;
        }
 
        $response = new stdClass;

-       $response->status = $resp['response']['code'];
-       $response->response_code = $resp['response']['code'];
+       $response->status = wp_remote_retrieve_response_code( $resp );
+       $response->response_code = wp_remote_retrieve_response_code( $resp );

        $response->headers = $return_headers;
        $response->headers = $return_headers;

-       $response->results = $resp['body'];
+       $response->results = wp_remote_retrieve_body( $resp );

 
        return $response;
 }
 
        return $response;
 }


@@ -935,5 +934,3 @@ function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
        }
 }
 endif;
        }
 }
 endif;

-
-?>