enmi-conf.org: comparison wp/wp-includes/feed.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 * You can retrieve anything that you can using the get_bloginfo() function.
 * Everything will be stripped of tags and characters converted, when the values
 * are retrieved for use in the feeds.
 *
 * @since 1.5.1
+*
 * @see get_bloginfo() For the list of possible values to display.
 *
 * @param string $show See get_bloginfo() for possible values.
 * @return string
 */
 * You can retrieve anything that you can using the get_bloginfo() function.
 * Everything will be stripped of tags and characters converted, when the values
 * are retrieved for use in the feeds.
 *
 * @since 0.71
+*
 * @see get_bloginfo() For the list of possible values to display.
 *
 * @param string $show See get_bloginfo() for possible values.
 */
 function bloginfo_rss( $show = '' ) {
 	 *
 	 * @param string $feed_type Type of default feed. Possible values include 'rss2', 'atom'.
 	 *                          Default 'rss2'.
 	 */
 	$default_feed = apply_filters( 'default_feed', 'rss2' );
-	return 'rss' == $default_feed ? 'rss2' : $default_feed;
+	return ( 'rss' === $default_feed ) ? 'rss2' : $default_feed;
 }
 /**
 * Retrieve the blog title for the feed title.
 *
 * @param string $deprecated Unused..
 * @return string The document title.
 */
 function get_wp_title_rss( $deprecated = '&#8211;' ) {
 	if ( '&#8211;' !== $deprecated ) {
-		/* translators: %s: 'document_title_separator' filter name */
+		/* translators: %s: 'document_title_separator' filter name. */
 		_deprecated_argument( __FUNCTION__, '4.4.0', sprintf( __( 'Use the %s filter instead.' ), '<code>document_title_separator</code>' ) );
 	}
 	/**
 	 * Filters the blog title for use as the feed title.
 *
 * @param string $deprecated Unused.
 */
 function wp_title_rss( $deprecated = '&#8211;' ) {
 	if ( '&#8211;' !== $deprecated ) {
-		/* translators: %s: 'document_title_separator' filter name */
+		/* translators: %s: 'document_title_separator' filter name. */
 		_deprecated_argument( __FUNCTION__, '4.4.0', sprintf( __( 'Use the %s filter instead.' ), '<code>document_title_separator</code>' ) );
 	}
 	/**
 	 * Filters the blog title for display of the feed title.
 	 *
 	 * @since 1.2.0
 	 *
 	 * @param string $title The current post title.
 	 */
-	$title = apply_filters( 'the_title_rss', $title );
+	return apply_filters( 'the_title_rss', $title );
-	return $title;
 }
 /**
 * Display the post title in the feed.
 *
 /**
 * Retrieve the post content for feeds.
 *
 * @since 2.9.0
+*
 * @see get_the_content()
 *
 * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
 * @return string The filtered content.
 */
 	}
 	/** This filter is documented in wp-includes/post-template.php */
 	$content = apply_filters( 'the_content', get_the_content() );
 	$content = str_replace( ']]>', ']]&gt;', $content );
 	/**
 	 * Filters the post content for use in feeds.
 	 *
 	 * @since 2.9.0
 	 *
 /**
 * Outputs the link to the comments for the current post in an xml safe way
 *
 * @since 3.0.0
-* @return none
 */
 function comments_link_feed() {
 	/**
 	 * Filters the comments permalink for the current post.
 	 *
 /**
 * Display the feed GUID for the current comment.
 *
 * @since 2.5.0
 *
-* @param int|WP_Comment $comment_id Optional comment object or id. Defaults to global comment object.
+* @param int|WP_Comment $comment_id Optional comment object or ID. Defaults to global comment object.
 */
 function comment_guid( $comment_id = null ) {
 	echo esc_url( get_comment_guid( $comment_id ) );
 }
 /**
 * Retrieve the feed GUID for the current comment.
 *
 * @since 2.5.0
 *
-* @param int|WP_Comment $comment_id Optional comment object or id. Defaults to global comment object.
+* @param int|WP_Comment $comment_id Optional comment object or ID. Defaults to global comment object.
-* @return false|string false on failure or guid for comment on success.
+* @return string|false GUID for comment on success, false on failure.
 */
 function get_comment_guid( $comment_id = null ) {
 	$comment = get_comment( $comment_id );
 	if ( ! is_object( $comment ) ) {
 * Display the link to the comments.
 *
 * @since 1.5.0
 * @since 4.4.0 Introduced the `$comment` argument.
 *
-* @param int|WP_Comment $comment Optional. Comment object or id. Defaults to global comment object.
+* @param int|WP_Comment $comment Optional. Comment object or ID. Defaults to global comment object.
 */
 function comment_link( $comment = null ) {
 	/**
 	 * Filters the current comment's permalink.
 	 *
 	$tags       = get_the_tags();
 	$the_list   = '';
 	$cat_names  = array();
 	$filter = 'rss';
-	if ( 'atom' == $type ) {
+	if ( 'atom' === $type ) {
 		$filter = 'raw';
 	}
 	if ( ! empty( $categories ) ) {
 		foreach ( (array) $categories as $category ) {
 	}
 	$cat_names = array_unique( $cat_names );
 	foreach ( $cat_names as $cat_name ) {
-		if ( 'rdf' == $type ) {
+		if ( 'rdf' === $type ) {
 			$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
-		} elseif ( 'atom' == $type ) {
+		} elseif ( 'atom' === $type ) {
 			$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
 		} else {
-			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option( 'blog_charset' ) ) . "]]></category>\n";
+			$the_list .= "\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option( 'blog_charset' ) ) . "]]></category>\n";
 		}
 	}
 	/**
 	 * Filters all of the post categories for display in a feed.
 /**
 * Display the post categories in the feed.
 *
 * @since 0.71
+*
 * @see get_the_category_rss() For better explanation.
 *
 * @param string $type Optional, default is the type returned by get_default_feed().
 */
 function the_category_rss( $type = null ) {
 	if ( post_password_required() ) {
 		return;
 	}
 	foreach ( (array) get_post_custom() as $key => $val ) {
-		if ( $key == 'enclosure' ) {
+		if ( 'enclosure' === $key ) {
 			foreach ( (array) $val as $enc ) {
 				$enclosure = explode( "\n", $enc );
-				// only get the first element, e.g. 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];
 				/**
 				 * Filters the RSS enclosure HTML link tag for the current post.
 	if ( post_password_required() ) {
 		return;
 	}
 	foreach ( (array) get_post_custom() as $key => $val ) {
-		if ( $key == 'enclosure' ) {
+		if ( 'enclosure' === $key ) {
 			foreach ( (array) $val as $enc ) {
 				$enclosure = explode( "\n", $enc );
+				$url    = '';
+				$type   = '';
+				$length = 0;
+				$mimes = get_allowed_mime_types();
+				// Parse URL.
+				if ( isset( $enclosure[0] ) && is_string( $enclosure[0] ) ) {
+					$url = trim( $enclosure[0] );
+				}
+				// Parse length and type.
+				for ( $i = 1; $i <= 2; $i++ ) {
+					if ( isset( $enclosure[ $i ] ) ) {
+						if ( is_numeric( $enclosure[ $i ] ) ) {
+							$length = trim( $enclosure[ $i ] );
+						} elseif ( in_array( $enclosure[ $i ], $mimes, true ) ) {
+							$type = trim( $enclosure[ $i ] );
+						}
+					}
+				}
+				$html_link_tag = sprintf(
+					"<link href=\"%s\" rel=\"enclosure\" length=\"%d\" type=\"%s\" />\n",
+					esc_url( $url ),
+					esc_attr( $length ),
+					esc_attr( $type )
+				);
 				/**
 				 * Filters the atom enclosure HTML link tag for the current post.
 				 *
 				 * @since 2.2.0
 				 *
 				 * @param string $html_link_tag The HTML link tag with a URI and other attributes.
 				 */
-				echo apply_filters( 'atom_enclosure', '<link href="' . esc_url( trim( $enclosure[0] ) ) . '" rel="enclosure" length="' . absint( trim( $enclosure[1] ) ) . '" type="' . esc_attr( trim( $enclosure[2] ) ) . '" />' . "\n" );
+				echo apply_filters( 'atom_enclosure', $html_link_tag );
 			}
 		}
 	}
 }
 /**
 * Determine the type of a string of data with the data formatted.
 *
-* Tell whether the type is text, html, or xhtml, per RFC 4287 section 3.1.
+* Tell whether the type is text, HTML, or XHTML, per RFC 4287 section 3.1.
 *
 * In the case of WordPress, text is defined as containing no markup,
-* xhtml is defined as "well formed", and html as tag soup (i.e., the rest).
+* XHTML is defined as "well formed", and HTML as tag soup (i.e., the rest).
 *
-* Container div tags are added to xhtml values, per section 3.1.1.3.
+* Container div tags are added to XHTML values, per section 3.1.1.3.
 *
 * @link http://www.atomenabled.org/developers/syndication/atom-format-spec.php#rfc.section.3.1
 *
 * @since 2.5.0
 *
 	$parser = xml_parser_create();
 	xml_parse( $parser, '<div>' . $data . '</div>', true );
 	$code = xml_get_error_code( $parser );
 	xml_parser_free( $parser );
+	unset( $parser );
 	if ( ! $code ) {
 		if ( strpos( $data, '<' ) === false ) {
 			return array( 'text', $data );
 		} else {
 * @see get_site_icon_url()
 */
 function atom_site_icon() {
 	$url = get_site_icon_url( 32 );
 	if ( $url ) {
-		echo "<icon>$url</icon>\n";
+		echo '<icon>' . convert_chars( $url ) . "</icon>\n";
 	}
 }
 /**
 * Displays Site Icon in RSS2.
 </image> ' . "\n";
 	}
 }
 /**
+* Returns the link for the currently displayed feed.
+*
+* @since 5.3.0
+*
+* @return string Correct link for the atom:self element.
+*/
+function get_self_link() {
+	$host = parse_url( home_url() );
+	return set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) );
+}
+/**
 * Display the link for the currently displayed feed in a XSS safe way.
 *
 * Generate a correct link for the atom:self element.
 *
 * @since 2.5.0
 */
 function self_link() {
-	$host = @parse_url( home_url() );
 	/**
 	 * Filters the current feed URL.
 	 *
 	 * @since 3.6.0
 	 *
 	 * @see set_url_scheme()
 	 * @see wp_unslash()
 	 *
 	 * @param string $feed_link The link for the feed with set URL scheme.
 	 */
-	echo esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
+	echo esc_url( apply_filters( 'self_link', get_self_link() ) );
 }
-/*
+/**
-* Get the timestamp of the most recently modified post from WP_Query.
+* Get the UTC time of the most recently modified post from WP_Query.
 *
-* If viewing a comment feed, the timestamp of the most recently modified
+* If viewing a comment feed, the time of the most recently modified
 * comment will be returned.
 *
-* @global WP_Query  $wp_query The global WP_Query object.
+* @global WP_Query $wp_query WordPress Query object.
 *
 * @since 5.2.0
 *
-* @param string $format Format of the timestamp to return, passed to mysql2date.
+* @param string $format Date format string to return the time in.
-*
+* @return string|false The time in requested format, or false on failure.
-* @return string The timestamp.
 */
 function get_feed_build_date( $format ) {
 	global $wp_query;
-	if ( empty( $wp_query ) || ! $wp_query->have_posts() ) {
+	$datetime          = false;
-		// Fallback to last time any post was modified or published.
+	$max_modified_time = false;
-		return get_lastpostmodified( 'GMT' );
+	$utc               = new DateTimeZone( 'UTC' );
-	}
+	if ( ! empty( $wp_query ) && $wp_query->have_posts() ) {
-	// Extract the post modified times from the posts.
+		// Extract the post modified times from the posts.
-	$modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
+		$modified_times = wp_list_pluck( $wp_query->posts, 'post_modified_gmt' );
-	// If this is a comment feed, check those objects too.
+		// If this is a comment feed, check those objects too.
-	if ( $wp_query->is_comment_feed() && $wp_query->comment_count ) {
+		if ( $wp_query->is_comment_feed() && $wp_query->comment_count ) {
-		// Extract the comment modified times from the comments.
+			// Extract the comment modified times from the comments.
-		$comment_times = wp_list_pluck( $wp_query->comments, 'comment_date_gmt' );
+			$comment_times = wp_list_pluck( $wp_query->comments, 'comment_date_gmt' );
-		// Add the comment times to the post times for comparison.
+			// Add the comment times to the post times for comparison.
-		$modified_times = array_merge( $modified_times, $comment_times );
+			$modified_times = array_merge( $modified_times, $comment_times );
-	}
+		}
-	// Determine the maximum modified time.
+		// Determine the maximum modified time.
-	$max_modified_time = mysql2date( $format, max( $modified_times ), false );
+		$datetime = date_create_immutable_from_format( 'Y-m-d H:i:s', max( $modified_times ), $utc );
+	}
+	if ( false === $datetime ) {
+		// Fall back to last time any post was modified or published.
+		$datetime = date_create_immutable_from_format( 'Y-m-d H:i:s', get_lastpostmodified( 'GMT' ), $utc );
+	}
+	if ( false !== $datetime ) {
+		$max_modified_time = $datetime->format( $format );
+	}
 	/**
 	 * Filters the date the last post or comment in the query was modified.
 	 *
 	 * @since 5.2.0
 	 *
-	 * @param string $max_modified_time Date the last post or comment was modified in the query.
+	 * @param string|false $max_modified_time Date the last post or comment was modified in the query, in UTC.
-	 * @param string $format            The date format requested in get_feed_build_date.
+	 *                                        False on failure.
+	 * @param string       $format            The date format requested in get_feed_build_date().
 	 */
 	return apply_filters( 'get_feed_build_date', $max_modified_time, $format );
 }
 /**
 /**
 * Build SimplePie object based on RSS or Atom feed from URL.
 *
 * @since 2.8.0
 *
-* @param mixed $url URL of feed to retrieve. If an array of URLs, the feeds are merged
+* @param string|string[] $url URL of feed to retrieve. If an array of URLs, the feeds are merged
-* using SimplePie's multifeed feature.
+*                             using SimplePie's multifeed feature.
-* See also {@link http://simplepie.org/wiki/faq/typical_multifeed_gotchas}
+*                             See also {@link http://simplepie.org/wiki/faq/typical_multifeed_gotchas}
-*
+* @return SimplePie|WP_Error SimplePie object on success or WP_Error object on failure.
-* @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
 */
 function fetch_feed( $url ) {
 	if ( ! class_exists( 'SimplePie', false ) ) {
-		require_once( ABSPATH . WPINC . '/class-simplepie.php' );
+		require_once ABSPATH . WPINC . '/class-simplepie.php';
 	}
-	require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' );
+	require_once ABSPATH . WPINC . '/class-wp-feed-cache.php';
-	require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' );
+	require_once ABSPATH . WPINC . '/class-wp-feed-cache-transient.php';
-	require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' );
+	require_once ABSPATH . WPINC . '/class-wp-simplepie-file.php';
-	require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
+	require_once ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php';
 	$feed = new SimplePie();
 	$feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
 	// We must manually overwrite $feed->sanitize because SimplePie's
-	// constructor sets it before we have a chance to set the sanitization class
+	// constructor sets it before we have a chance to set the sanitization class.
 	$feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 	$feed->set_cache_class( 'WP_Feed_Cache' );
 	$feed->set_file_class( 'WP_SimplePie_File' );
 	$feed->set_feed_url( $url );
 	/** This filter is documented in wp-includes/class-wp-feed-cache-transient.php */
 	$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
 	/**
 	 * Fires just before processing the SimplePie feed object.
 	 *
 	 * @since 3.0.0
 	 *
-	 * @param object $feed SimplePie feed object (passed by reference).
+	 * @param SimplePie       $feed SimplePie feed object (passed by reference).
-	 * @param mixed  $url  URL of feed to retrieve. If an array of URLs, the feeds are merged.
+	 * @param string|string[] $url  URL of feed or array of URLs of feeds to retrieve.
 	 */
 	do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
 	$feed->init();
 	$feed->set_output_encoding( get_option( 'blog_charset' ) );
 	if ( $feed->error() ) {
 		return new WP_Error( 'simplepie-error', $feed->error() );

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a