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

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 * @subpackage Feed
 * @since 2.1.0
 */
 /**
-* RSS container for the bloginfo function.
+* Retrieves RSS container for the bloginfo function.
 *
 * 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.
 *
 	 */
 	return apply_filters( 'get_bloginfo_rss', convert_chars( $info ), $show );
 }
 /**
-* Display RSS container for the bloginfo function.
+* Displays RSS container for the bloginfo function.
 *
 * 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.
 *
 	 */
 	echo apply_filters( 'bloginfo_rss', get_bloginfo_rss( $show ), $show );
 }
 /**
-* Retrieve the default feed.
+* Retrieves the default feed.
 *
 * The default feed is 'rss2', unless a plugin changes it through the
 * {@see 'default_feed'} filter.
 *
 * @since 2.5.0
 	return ( 'rss' === $default_feed ) ? 'rss2' : $default_feed;
 }
 /**
-* Retrieve the blog title for the feed title.
+* Retrieves the blog title for the feed title.
 *
 * @since 2.2.0
 * @since 4.4.0 The optional `$sep` parameter was deprecated and renamed to `$deprecated`.
 *
-* @param string $deprecated Unused..
+* @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. */
 	 */
 	return apply_filters( 'get_wp_title_rss', wp_get_document_title(), $deprecated );
 }
 /**
-* Display the blog title for display of the feed title.
+* Displays the blog title for display of the feed title.
 *
 * @since 2.2.0
 * @since 4.4.0 The optional `$sep` parameter was deprecated and renamed to `$deprecated`.
 *
 * @param string $deprecated Unused.
 	 */
 	echo apply_filters( 'wp_title_rss', get_wp_title_rss(), $deprecated );
 }
 /**
-* Retrieve the current post title for the feed.
+* Retrieves the current post title for the feed.
 *
 * @since 2.0.0
-*
+* @since 6.6.0 Added the `$post` parameter.
+*
+* @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
 * @return string Current post title.
 */
-function get_the_title_rss() {
+function get_the_title_rss( $post = 0 ) {
-	$title = get_the_title();
+	$title = get_the_title( $post );
 	/**
 	 * Filters the post title for use in a feed.
 	 *
 	 * @since 1.2.0
 	 */
 	return apply_filters( 'the_title_rss', $title );
 }
 /**
-* Display the post title in the feed.
+* Displays the post title in the feed.
 *
 * @since 0.71
 */
 function the_title_rss() {
 	echo get_the_title_rss();
 }
 /**
-* Retrieve the post content for feeds.
+* Retrieves the post content for feeds.
 *
 * @since 2.9.0
 *
 * @see get_the_content()
 *
 	 */
 	return apply_filters( 'the_content_feed', $content, $feed_type );
 }
 /**
-* Display the post content for feeds.
+* Displays the post content for feeds.
 *
 * @since 2.9.0
 *
 * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
 */
 function the_content_feed( $feed_type = null ) {
 	echo get_the_content_feed( $feed_type );
 }
 /**
-* Display the post excerpt for the feed.
+* Displays the post excerpt for the feed.
 *
 * @since 0.71
 */
 function the_excerpt_rss() {
 	$output = get_the_excerpt();
 	 */
 	echo apply_filters( 'the_excerpt_rss', $output );
 }
 /**
-* Display the permalink to the post for use in feeds.
+* Displays the permalink to the post for use in feeds.
 *
 * @since 2.3.0
 */
 function the_permalink_rss() {
 	/**
 	 */
 	echo esc_url( apply_filters( 'the_permalink_rss', get_permalink() ) );
 }
 /**
-* Outputs the link to the comments for the current post in an xml safe way
+* Outputs the link to the comments for the current post in an XML safe way.
 *
 * @since 3.0.0
 */
 function comments_link_feed() {
 	/**
 	 */
 	echo esc_url( apply_filters( 'comments_link_feed', get_comments_link() ) );
 }
 /**
-* Display the feed GUID for the current comment.
+* Displays 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.
 */
 function comment_guid( $comment_id = null ) {
 	echo esc_url( get_comment_guid( $comment_id ) );
 }
 /**
-* Retrieve the feed GUID for the current comment.
+* Retrieves 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.
 * @return string|false GUID for comment on success, false on failure.
 	return get_the_guid( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
 }
 /**
-* Display the link to the comments.
+* Displays 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.
 	 */
 	echo esc_url( apply_filters( 'comment_link', get_comment_link( $comment ) ) );
 }
 /**
-* Retrieve the current comment author for use in the feeds.
+* Retrieves the current comment author for use in the feeds.
 *
 * @since 2.0.0
 *
-* @return string Comment Author
+* @return string Comment Author.
 */
 function get_comment_author_rss() {
 	/**
 	 * Filters the current comment author for use in a feed.
 	 *
 	 */
 	return apply_filters( 'comment_author_rss', get_comment_author() );
 }
 /**
-* Display the current comment author in the feed.
+* Displays the current comment author in the feed.
 *
 * @since 1.0.0
 */
 function comment_author_rss() {
 	echo get_comment_author_rss();
 }
 /**
-* Display the current comment content for use in the feeds.
+* Displays the current comment content for use in the feeds.
 *
 * @since 1.0.0
 */
 function comment_text_rss() {
 	$comment_text = get_comment_text();
 	$comment_text = apply_filters( 'comment_text_rss', $comment_text );
 	echo $comment_text;
 }
 /**
-* Retrieve all of the post categories, formatted for use in feeds.
+* Retrieves all of the post categories, formatted for use in feeds.
 *
 * All of the categories for the current post in the feed loop, will be
 * retrieved and have feed markup added, so that they can easily be added to the
 * RSS2, Atom, or RSS1 and RSS0.91 RDF feeds.
 *
 	 */
 	return apply_filters( 'the_category_rss', $the_list, $type );
 }
 /**
-* Display the post categories in the feed.
+* Displays the post categories in the feed.
 *
 * @since 0.71
 *
 * @see get_the_category_rss() For better explanation.
 *
 function the_category_rss( $type = null ) {
 	echo get_the_category_rss( $type );
 }
 /**
-* Display the HTML type based on the blog setting.
+* Displays the HTML type based on the blog setting.
 *
 * The two possible values are either 'xhtml' or 'html'.
 *
 * @since 2.2.0
 */
 function html_type_rss() {
 	$type = get_bloginfo( 'html_type' );
-	if ( strpos( $type, 'xhtml' ) !== false ) {
+	if ( str_contains( $type, 'xhtml' ) ) {
 		$type = 'xhtml';
 	} else {
 		$type = 'html';
 	}
 	echo $type;
 }
 /**
-* Display the rss enclosure for the current post.
+* Displays the rss enclosure for the current post.
 *
 * Uses the global $post to check whether the post requires a password and if
 * the user has the password for the post. If not then it will return before
 * displaying.
 *
 		}
 	}
 }
 /**
-* Display the atom enclosure for the current post.
+* Displays the atom enclosure for the current post.
 *
 * Uses the global $post to check whether the post requires a password and if
 * the user has the password for the post. If not then it will return before
 * displaying.
 *
 		}
 	}
 }
 /**
-* Determine the type of a string of data with the data formatted.
+* Determines 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.
 *
 * 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).
 *
 * @link http://www.atomenabled.org/developers/syndication/atom-format-spec.php#rfc.section.3.1
 *
 * @since 2.5.0
 *
-* @param string $data Input string
+* @param string $data Input string.
 * @return array array(type, value)
 */
 function prep_atom_text_construct( $data ) {
-	if ( strpos( $data, '<' ) === false && strpos( $data, '&' ) === false ) {
+	if ( ! str_contains( $data, '<' ) && ! str_contains( $data, '&' ) ) {
 		return array( 'text', $data );
 	}
 	if ( ! function_exists( 'xml_parser_create' ) ) {
-		trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+		wp_trigger_error( '', __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
 		return array( 'html', "<![CDATA[$data]]>" );
 	}
 	$parser = xml_parser_create();
 	$code = xml_get_error_code( $parser );
 	xml_parser_free( $parser );
 	unset( $parser );
 	if ( ! $code ) {
-		if ( strpos( $data, '<' ) === false ) {
+		if ( ! str_contains( $data, '<' ) ) {
 			return array( 'text', $data );
 		} else {
 			$data = "<div xmlns='http://www.w3.org/1999/xhtml'>$data</div>";
 			return array( 'xhtml', $data );
 		}
 	}
-	if ( strpos( $data, ']]>' ) === false ) {
+	if ( ! str_contains( $data, ']]>' ) ) {
 		return array( 'html', "<![CDATA[$data]]>" );
 	} else {
 		return array( 'html', htmlspecialchars( $data ) );
 	}
 }
 * @since 5.3.0
 *
 * @return string Correct link for the atom:self element.
 */
 function get_self_link() {
-	$host = parse_url( home_url() );
+	$parsed = parse_url( home_url() );
-	return set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) );
-}
+	$domain = $parsed['host'];
+	if ( isset( $parsed['port'] ) ) {
-/**
+		$domain .= ':' . $parsed['port'];
-* Display the link for the currently displayed feed in a XSS safe way.
+	}
+	return set_url_scheme( 'http://' . $domain . wp_unslash( $_SERVER['REQUEST_URI'] ) );
+}
+/**
+* Displays 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
 */
 	 */
 	echo esc_url( apply_filters( 'self_link', get_self_link() ) );
 }
 /**
-* Get the UTC time of the most recently modified post from WP_Query.
+* Gets the UTC time of the most recently modified post from WP_Query.
 *
 * If viewing a comment feed, the time of the most recently modified
 * comment will be returned.
 *
+* @since 5.2.0
+*
 * @global WP_Query $wp_query WordPress Query object.
-*
-* @since 5.2.0
 *
 * @param string $format Date format string to return the time in.
 * @return string|false The time in requested format, or false on failure.
 */
 function get_feed_build_date( $format ) {
 	 */
 	return apply_filters( 'get_feed_build_date', $max_modified_time, $format );
 }
 /**
-* Return the content type for specified feed type.
+* Returns the content type for specified feed type.
 *
 * @since 2.8.0
 *
 * @param string $type Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
+* @return string Content type for specified feed type.
 */
 function feed_content_type( $type = '' ) {
 	if ( empty( $type ) ) {
 		$type = get_default_feed();
 	}
 	 */
 	return apply_filters( 'feed_content_type', $content_type, $type );
 }
 /**
-* Build SimplePie object based on RSS or Atom feed from URL.
+* Builds SimplePie object based on RSS or Atom feed from URL.
 *
 * @since 2.8.0
 *
 * @param string|string[] $url URL of feed to retrieve. If an array of URLs, the feeds are merged
 *                             using SimplePie's multifeed feature.
 	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.
+	 * We must manually overwrite $feed->sanitize because SimplePie's constructor
+	 * sets it before we have a chance to set the sanitization class.
+	 */
 	$feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 	// Register the cache handler using the recommended method for SimplePie 1.3 or later.
 	if ( method_exists( 'SimplePie_Cache', 'register' ) ) {
 		SimplePie_Cache::register( 'wp_transient', 'WP_Feed_Cache_Transient' );

changeset 21	48c4eec2b7e6
parent 18	be944660c56a
child 22	8c2e4d02f4ef