Merge branch 'trunk' of https://github.com/WordPress/wordpress-develop into ppiwo/trunk

* 'trunk' of https://github.com/WordPress/wordpress-develop:
  Twenty Sixteen: Document the `twentysixteen_author_avatar_size` filter.
  Abilities API: Ensure public method is used in the codebase
  General: Add comment explaining use of queried object in `feed_links_extra()` instead of global `$post`.
  Posts, Post Types: Update `get_the_modified_author()` to handle missing global `$post` and add (missing) `$post` arg.
  General: Improve resilience of `feed_links_extra()` when global `$post` is not set.
  Twenty Sixteen: Document the `twentysixteen_content_width` filter.
  Template activation: fix unique slug filtering.
  Coding Standards: Use Yoda conditions consistently in `wp-includes/formatting.php`.

Author: westonruter

src/wp-content/themes/twentysixteen/functions.php

@@ -246,6 +246,13 @@ function twentysixteen_setup() {
  * @since Twenty Sixteen 1.0
  */
 function twentysixteen_content_width() {
+	/**
+	 * Filters Twenty Sixteen content width of the theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @param int $content_width Content width in pixels.
+	 */
 	$GLOBALS['content_width'] = apply_filters( 'twentysixteen_content_width', 840 );
 }
 add_action( 'after_setup_theme', 'twentysixteen_content_width', 0 );

src/wp-content/themes/twentysixteen/inc/template-tags.php

@@ -19,6 +19,13 @@
 	 */
 	function twentysixteen_entry_meta() {
 		if ( 'post' === get_post_type() ) {
+			/**
+			 * Filters the Twenty Sixteen entry meta avatar size.
+			 *
+			 * @since Twenty Sixteen 1.0
+			 *
+			 * @param int $size The avatar height and width size in pixels.
+			 */
 			$author_avatar_size = apply_filters( 'twentysixteen_author_avatar_size', 49 );
 			printf(
 				'<span class="byline">%1$s<span class="screen-reader-text">%2$s </span><span class="author vcard"><a class="url fn n" href="%3$s">%4$s</a></span></span>',

src/wp-includes/abilities-api/class-wp-abilities-registry.php

@@ -121,8 +121,7 @@ public function register( string $name, array $args ): ?WP_Ability {
 
 		// Validate ability category exists if provided (will be validated as required in WP_Ability).
 		if ( isset( $args['category'] ) ) {
-			$category_registry = WP_Ability_Categories_Registry::get_instance();
-			if ( ! $category_registry->is_registered( $args['category'] ) ) {
+			if ( ! wp_has_ability_category( $args['category'] ) ) {
 				_doing_it_wrong(
 					__METHOD__,
 					sprintf(

src/wp-includes/author-template.php

@@ -86,24 +86,31 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
  * Retrieves the author who last edited the current post.
  *
  * @since 2.8.0
+ * @since 6.9.0 Added the `$post` parameter. Unknown return value is now explicitly null instead of void.
  *
- * @return string|void The author's display name, empty string if unknown.
+ * @param int|WP_Post|null $post Optional. Post ID or post object. Default is global `$post` object.
+ * @return string|null The author's display name. Empty string if user is unavailable. Null if there was no last editor or the post is invalid.
  */
-function get_the_modified_author() {
-	$last_id = get_post_meta( get_post()->ID, '_edit_last', true );
-
-	if ( $last_id ) {
-		$last_user = get_userdata( $last_id );
+function get_the_modified_author( $post = null ) {
+	$post = get_post( $post );
+	if ( ! $post ) {
+		return null;
+	}
 
-		/**
-		 * Filters the display name of the author who last edited the current post.
-		 *
-		 * @since 2.8.0
-		 *
-		 * @param string $display_name The author's display name, empty string if unknown.
-		 */
-		return apply_filters( 'the_modified_author', $last_user ? $last_user->display_name : '' );
+	$last_id = get_post_meta( $post->ID, '_edit_last', true );
+	if ( ! $last_id ) {
+		return null;
 	}
+	$last_user = get_userdata( $last_id );
+
+	/**
+	 * Filters the display name of the author who last edited the current post.
+	 *
+	 * @since 2.8.0
+	 *
+	 * @param string $display_name The author's display name, empty string if user is unavailable.
+	 */
+	return apply_filters( 'the_modified_author', $last_user ? $last_user->display_name : '' );
 }
 
 /**

src/wp-includes/formatting.php

@@ -446,7 +446,7 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
 function wpautop( $text, $br = true ) {
 	$pre_tags = array();
 
-	if ( trim( $text ) === '' ) {
+	if ( '' === trim( $text ) ) {
 		return '';
 	}
 
@@ -1181,7 +1181,7 @@ function utf8_uri_encode( $utf8_string, $length = 0, $encode_ascii_characters =
 			$unicode        .= $encoded_char;
 			$unicode_length += $encoded_char_length;
 		} else {
-			if ( count( $values ) === 0 ) {
+			if ( 0 === count( $values ) ) {
 				if ( $value < 224 ) {
 					$num_octets = 2;
 				} elseif ( $value < 240 ) {
@@ -2558,7 +2558,7 @@ function convert_invalid_entities( $content ) {
  * @return string Balanced text.
  */
 function balanceTags( $text, $force = false ) {  // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-	if ( $force || (int) get_option( 'use_balanceTags' ) === 1 ) {
+	if ( $force || 1 === (int) get_option( 'use_balanceTags' ) ) {
 		return force_balance_tags( $text );
 	} else {
 		return $text;
@@ -2999,7 +2999,7 @@ function _make_web_ftp_clickable_cb( $matches ) {
 
 	// Removed trailing [.,;:)] from URL.
 	$last_char = substr( $dest, -1 );
-	if ( in_array( $last_char, array( '.', ',', ';', ':', ')' ), true ) === true ) {
+	if ( in_array( $last_char, array( '.', ',', ';', ':', ')' ), true ) ) {
 		$ret  = $last_char;
 		$dest = substr( $dest, 0, strlen( $dest ) - 1 );
 	}
@@ -3326,7 +3326,7 @@ function wp_targeted_link_rel( $text ) {
 	_deprecated_function( __FUNCTION__, '6.7.0' );
 
 	// Don't run (more expensive) regex if no links with targets.
-	if ( stripos( $text, 'target' ) === false || stripos( $text, '<a ' ) === false || is_serialized( $text ) ) {
+	if ( false === stripos( $text, 'target' ) || false === stripos( $text, '<a ' ) || is_serialized( $text ) ) {
 		return $text;
 	}
 
@@ -3446,7 +3446,7 @@ function wp_remove_targeted_link_rel_filters() {
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) === 0 ) {
+	if ( 0 === count( $matches ) ) {
 		return '';
 	}
 
@@ -3572,7 +3572,7 @@ function is_email( $email, $deprecated = false ) {
 	}
 
 	// Test for an @ character after the first position.
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if ( false === strpos( $email, '@', 1 ) ) {
 		/** This filter is documented in wp-includes/formatting.php */
 		return apply_filters( 'is_email', false, $email, 'email_no_at' );
 	}
@@ -3786,7 +3786,7 @@ function sanitize_email( $email ) {
 	}
 
 	// Test for an @ character after the first position.
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if ( false === strpos( $email, '@', 1 ) ) {
 		/** This filter is documented in wp-includes/formatting.php */
 		return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );
 	}
@@ -5362,7 +5362,7 @@ function wp_sprintf_l( $pattern, $args ) {
 
 	$args   = (array) $args;
 	$result = array_shift( $args );
-	if ( count( $args ) === 1 ) {
+	if ( 1 === count( $args ) ) {
 		$result .= $l['between_only_two'] . array_shift( $args );
 	}
 

src/wp-includes/general-template.php

@@ -3326,9 +3326,13 @@ function feed_links_extra( $args = array() ) {
 	 */
 	$args = apply_filters( 'feed_links_extra_args', $args );
 
-	if ( is_singular() ) {
-		$id   = 0;
-		$post = get_post( $id );
+	/*
+	 * The template conditionals are referring to the global query, so the queried object is used rather than
+	 * depending on a global $post being set.
+	 */
+	$queried_object = get_queried_object();
+	if ( is_singular() && $queried_object instanceof WP_Post ) {
+		$post = $queried_object;
 
 		/** This filter is documented in wp-includes/general-template.php */
 		$show_comments_feed = apply_filters( 'feed_links_show_comments_feed', true );
@@ -3348,12 +3352,17 @@ function feed_links_extra( $args = array() ) {
 		 */
 		$show_post_comments_feed = apply_filters( 'feed_links_extra_show_post_comments_feed', $show_comments_feed );
 
-		if ( $show_post_comments_feed && ( comments_open() || pings_open() || $post->comment_count > 0 ) ) {
+		if ( $show_post_comments_feed && ( comments_open( $post ) || pings_open( $post ) || (int) $post->comment_count > 0 ) ) {
 			$title = sprintf(
 				$args['singletitle'],
 				get_bloginfo( 'name' ),
 				$args['separator'],
-				the_title_attribute( array( 'echo' => false ) )
+				the_title_attribute(
+					array(
+						'echo' => false,
+						'post' => $post,
+					)
+				)
 			);
 
 			$feed_link = get_post_comments_feed_link( $post->ID );

src/wp-includes/theme-templates.php

@@ -50,8 +50,8 @@ function wp_filter_wp_template_unique_post_slug( $override_slug, $slug, $post_id
 	}
 
 	// For wp_template, slugs no longer have to be unique within the same theme.
-	if ( 'wp_template' !== $post_type ) {
-		return $override_slug;
+	if ( 'wp_template' === $post_type ) {
+		return $slug;
 	}
 
 	if ( ! $override_slug ) {

tests/phpunit/tests/general/feedLinksExtra.php

@@ -634,4 +634,15 @@ public function data_feed_links_extra_should_output_nothing_when_filters_return_
 			),
 		);
 	}
+
+	/**
+	 * @ticket 63263
+	 */
+	public function test_feed_links_extra_should_work_fail_if_global_post_empty() {
+		$post_id = self::factory()->post->create();
+		$this->go_to( get_permalink( $post_id ) );
+		$GLOBALS['post'] = null;
+
+		$this->assertNotEmpty( get_echo( 'feed_links_extra' ) );
+	}
 }

tests/phpunit/tests/user/getTheModifiedAuthor.php

@@ -37,7 +37,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	public function set_up() {
 		parent::set_up();
 
-		$GLOBALS['post'] = self::$post_id;
+		$GLOBALS['post'] = get_post( self::$post_id );
 	}
 
 	public function test_get_the_modified_author() {
@@ -56,4 +56,44 @@ public function test_get_the_modified_author_should_return_empty_string_if_user_
 
 		$this->assertSame( '', get_the_modified_author() );
 	}
+
+	/**
+	 * @ticket 64104
+	 */
+	public function test_get_the_modified_author_when_post_global_does_not_exist() {
+		$GLOBALS['post'] = null;
+		$this->assertNull( get_the_modified_author() );
+	}
+
+	/**
+	 * @ticket 64104
+	 */
+	public function test_get_the_modified_author_when_invalid_post() {
+		$this->assertNull( get_the_modified_author( -1 ) );
+	}
+
+	/**
+	 * @ticket 64104
+	 */
+	public function test_get_the_modified_author_for_another_post() {
+		$expected_display_name = 'Test Editor';
+
+		$editor_id = self::factory()->user->create(
+			array(
+				'role'         => 'editor',
+				'user_login'   => 'test_editor',
+				'display_name' => $expected_display_name,
+				'description'  => 'test_editor',
+			)
+		);
+
+		$another_post_id = self::factory()->post->create();
+
+		$this->assertNull( get_the_modified_author( $another_post_id ) );
+		$this->assertNull( get_the_modified_author( get_post( $another_post_id ) ) );
+
+		add_post_meta( $another_post_id, '_edit_last', $editor_id );
+		$this->assertSame( $expected_display_name, get_the_modified_author( $another_post_id ) );
+		$this->assertSame( $expected_display_name, get_the_modified_author( get_post( $another_post_id ) ) );
+	}
 }