Wordpress 3.6

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

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 61825f8958d67a1dc2ab2a6f8d01ddfbf66df12f..e6b9ae0e68212b23923bc206297020a2d58ff362 100644 (file)
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -198,7 +198,7 @@ function the_permalink_rss() {
  * @return none
  */
 function comments_link_feed() {
  * @return none
  */
 function comments_link_feed() {

-       echo esc_url( get_comments_link() );
+       echo esc_url( apply_filters( 'comments_link_feed', get_comments_link() ) );

 }
 
 /**
 }
 
 /**


@@ -239,7 +239,7 @@ function get_comment_guid($comment_id = null) {
  * @since 1.5.0
  */
 function comment_link() {
  * @since 1.5.0
  */
 function comment_link() {

-       echo esc_url( get_comment_link() );
+       echo esc_url( apply_filters( 'comment_link', get_comment_link() ) );

 }
 
 /**
 }
 
 /**


@@ -391,7 +391,7 @@ function rss_enclosure() {
                        foreach ( (array) $val as $enc ) {
                                $enclosure = explode("\n", $enc);
 
                        foreach ( (array) $val as $enc ) {
                                $enclosure = explode("\n", $enc);
 

-                               //only get the the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
+                               // only get the first element, e.g. audio/mpeg from 'audio/mpeg mpga mp2 mp3'

                                $t = preg_split('/[ \t]/', trim($enclosure[2]) );
                                $type = $t[0];
 
                                $t = preg_split('/[ \t]/', trim($enclosure[2]) );
                                $type = $t[0];
 


@@ -488,7 +488,7 @@ function prep_atom_text_construct($data) {
  */
 function self_link() {
        $host = @parse_url(home_url());
  */
 function self_link() {
        $host = @parse_url(home_url());

-       echo esc_url( set_url_scheme( 'http://' . $host['host'] . stripslashes($_SERVER['REQUEST_URI']) ) );
+       echo esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );

 }
 
 /**
 }
 
 /**


@@ -520,11 +520,14 @@ function feed_content_type( $type = '' ) {
  *
  * @since 2.8
  *
  *
  * @since 2.8
  *

- * @param string $url URL to retrieve feed
+ * @param mixed $url URL of feed to retrieve. If an array of URLs, the feeds are merged
+ * using SimplePie's multifeed feature.
+ * See also {@link ​http://simplepie.org/wiki/faq/typical_multifeed_gotchas}
+ *

  * @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
  */
  * @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
  */

-function fetch_feed($url) {
-       require_once (ABSPATH . WPINC . '/class-feed.php');
+function fetch_feed( $url ) {
+       require_once ( ABSPATH . WPINC . '/class-feed.php' );

 
        $feed = new SimplePie();
 
 
        $feed = new SimplePie();
 


@@ -536,14 +539,14 @@ function fetch_feed($url) {
        $feed->set_cache_class( 'WP_Feed_Cache' );
        $feed->set_file_class( 'WP_SimplePie_File' );
 
        $feed->set_cache_class( 'WP_Feed_Cache' );
        $feed->set_file_class( 'WP_SimplePie_File' );
 

-       $feed->set_feed_url($url);
+       $feed->set_feed_url( $url );

        $feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
        do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
        $feed->init();
        $feed->handle_content_type();
 
        if ( $feed->error() )
        $feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
        do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
        $feed->init();
        $feed->handle_content_type();
 
        if ( $feed->error() )

-               return new WP_Error('simplepie-error', $feed->error());
+               return new WP_Error( 'simplepie-error', $feed->error() );

 
        return $feed;
 }
 
        return $feed;
 }