Merge branch 'WordPress:trunk' into trunk

Author: sabernhardt

src/wp-admin/includes/class-wp-list-table.php

@@ -600,7 +600,7 @@ protected function months_dropdown( $post_type ) {
 		}
 
 		/**
-		 * Filters to short-circuit performing the months dropdown query.
+		 * Filters whether to short-circuit performing the months dropdown query.
 		 *
 		 * @since 5.7.0
 		 *

src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -302,7 +302,12 @@ public function column_username( $user ) {
 	 */
 	public function column_name( $user ) {
 		if ( $user->first_name && $user->last_name ) {
-			echo "$user->first_name $user->last_name";
+			printf(
+				/* translators: 1: User's first name, 2: Last name. */
+				_x( '%1$s %2$s', 'Display name based on first name and last name' ),
+				$user->first_name,
+				$user->last_name
+			);
 		} elseif ( $user->first_name ) {
 			echo $user->first_name;
 		} elseif ( $user->last_name ) {

src/wp-admin/includes/class-wp-screen.php

@@ -430,7 +430,7 @@ public function set_current_screen() {
 	private function __construct() {}
 
 	/**
-	 * Indicates whether the screen is in a particular admin
+	 * Indicates whether the screen is in a particular admin.
 	 *
 	 * @since 3.5.0
 	 *
@@ -475,7 +475,7 @@ public static function add_old_compat_help( $screen, $help ) {
 	}
 
 	/**
-	 * Set the parent information for the screen.
+	 * Sets the parent information for the screen.
 	 *
 	 * This is called in admin-header.php after the menu parent for the screen has been determined.
 	 *
@@ -505,7 +505,7 @@ public function add_option( $option, $args = array() ) {
 	}
 
 	/**
-	 * Remove an option from the screen.
+	 * Removes an option from the screen.
 	 *
 	 * @since 3.8.0
 	 *
@@ -516,7 +516,7 @@ public function remove_option( $option ) {
 	}
 
 	/**
-	 * Remove all options from the screen.
+	 * Removes all options from the screen.
 	 *
 	 * @since 3.8.0
 	 */
@@ -525,7 +525,7 @@ public function remove_options() {
 	}
 
 	/**
-	 * Get the options registered for the screen.
+	 * Gets the options registered for the screen.
 	 *
 	 * @since 3.8.0
 	 *
@@ -606,7 +606,7 @@ public function get_help_tab( $id ) {
 	}
 
 	/**
-	 * Add a help tab to the contextual help for the screen.
+	 * Adds a help tab to the contextual help for the screen.
 	 *
 	 * Call this on the `load-$pagenow` hook for the relevant screen,
 	 * or fetch the `$current_screen` object, or use get_current_screen()
@@ -682,7 +682,7 @@ public function get_help_sidebar() {
 	}
 
 	/**
-	 * Add a sidebar to the contextual help for the screen.
+	 * Adds a sidebar to the contextual help for the screen.
 	 *
 	 * Call this in template files after admin.php is loaded and before admin-header.php is loaded
 	 * to add a sidebar to the contextual help.
@@ -713,7 +713,7 @@ public function get_columns() {
 	}
 
 	/**
-	 * Get the accessible hidden headings and text used in the screen.
+	 * Gets the accessible hidden headings and text used in the screen.
 	 *
 	 * @since 4.4.0
 	 *
@@ -726,7 +726,7 @@ public function get_screen_reader_content() {
 	}
 
 	/**
-	 * Get a screen reader text string.
+	 * Gets a screen reader text string.
 	 *
 	 * @since 4.4.0
 	 *
@@ -741,7 +741,7 @@ public function get_screen_reader_text( $key ) {
 	}
 
 	/**
-	 * Add accessible hidden headings and text for the screen.
+	 * Adds accessible hidden headings and text for the screen.
 	 *
 	 * @since 4.4.0
 	 *
@@ -768,7 +768,7 @@ public function set_screen_reader_content( $content = array() ) {
 	}
 
 	/**
-	 * Remove all the accessible hidden headings and text for the screen.
+	 * Removes all the accessible hidden headings and text for the screen.
 	 *
 	 * @since 4.4.0
 	 */
@@ -777,7 +777,7 @@ public function remove_screen_reader_content() {
 	}
 
 	/**
-	 * Render the screen's help section.
+	 * Renders the screen's help section.
 	 *
 	 * This will trigger the deprecated filters for backward compatibility.
 	 *
@@ -1034,7 +1034,7 @@ public function show_screen_options() {
 	}
 
 	/**
-	 * Render the screen options tab.
+	 * Renders the screen options tab.
 	 *
 	 * @since 3.3.0
 	 *
@@ -1097,7 +1097,7 @@ public function render_screen_options( $options = array() ) {
 	}
 
 	/**
-	 * Render the meta boxes preferences.
+	 * Renders the meta boxes preferences.
 	 *
 	 * @since 4.4.0
 	 *
@@ -1140,7 +1140,7 @@ public function render_meta_boxes_preferences() {
 	}
 
 	/**
-	 * Render the list table columns preferences.
+	 * Renders the list table columns preferences.
 	 *
 	 * @since 4.4.0
 	 */
@@ -1188,7 +1188,7 @@ public function render_list_table_columns_preferences() {
 	}
 
 	/**
-	 * Render the option for number of columns on the page
+	 * Renders the option for number of columns on the page.
 	 *
 	 * @since 3.3.0
 	 */
@@ -1220,7 +1220,7 @@ public function render_screen_layout() {
 	}
 
 	/**
-	 * Render the items per page option
+	 * Renders the items per page option.
 	 *
 	 * @since 3.3.0
 	 */
@@ -1284,7 +1284,7 @@ public function render_per_page_options() {
 	}
 
 	/**
-	 * Render the list table view mode preferences.
+	 * Renders the list table view mode preferences.
 	 *
 	 * @since 4.4.0
 	 *
@@ -1338,7 +1338,7 @@ public function render_view_mode() {
 	}
 
 	/**
-	 * Render screen reader text.
+	 * Renders screen reader text.
 	 *
 	 * @since 4.4.0
 	 *

src/wp-admin/includes/class-wp-users-list-table.php

@@ -568,7 +568,12 @@ public function single_row( $user_object, $style = '', $role = '', $numposts = 0
 						break;
 					case 'name':
 						if ( $user_object->first_name && $user_object->last_name ) {
-							$r .= "$user_object->first_name $user_object->last_name";
+							$r .= sprintf(
+								/* translators: 1: User's first name, 2: Last name. */
+								_x( '%1$s %2$s', 'Display name based on first name and last name' ),
+								$user_object->first_name,
+								$user_object->last_name
+							);
 						} elseif ( $user_object->first_name ) {
 							$r .= $user_object->first_name;
 						} elseif ( $user_object->last_name ) {

src/wp-admin/includes/taxonomy.php

@@ -11,7 +11,7 @@
 //
 
 /**
- * Check whether a category exists.
+ * Checks whether a category exists.
  *
  * @since 2.0.0
  *
@@ -30,7 +30,7 @@ function category_exists( $cat_name, $category_parent = null ) {
 }
 
 /**
- * Get category object for given ID and 'edit' filter context.
+ * Gets category object for given ID and 'edit' filter context.
  *
  * @since 2.0.0
  *
@@ -44,7 +44,7 @@ function get_category_to_edit( $id ) {
 }
 
 /**
- * Add a new category to the database if it does not already exist.
+ * Adds a new category to the database if it does not already exist.
  *
  * @since 2.0.0
  *
@@ -67,7 +67,7 @@ function wp_create_category( $cat_name, $category_parent = 0 ) {
 }
 
 /**
- * Create categories for the given post.
+ * Creates categories for the given post.
  *
  * @since 2.0.0
  *
@@ -210,7 +210,7 @@ function wp_update_category( $catarr ) {
 //
 
 /**
- * Check whether a post tag with a given name exists.
+ * Checks whether a post tag with a given name exists.
  *
  * @since 2.3.0
  *
@@ -224,7 +224,7 @@ function tag_exists( $tag_name ) {
 }
 
 /**
- * Add a new tag to the database if it does not already exist.
+ * Adds a new tag to the database if it does not already exist.
  *
  * @since 2.3.0
  *
@@ -236,7 +236,7 @@ function wp_create_tag( $tag_name ) {
 }
 
 /**
- * Get comma-separated list of tags available to edit.
+ * Gets comma-separated list of tags available to edit.
  *
  * @since 2.3.0
  *
@@ -249,7 +249,7 @@ function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 }
 
 /**
- * Get comma-separated list of terms available to edit for the given post ID.
+ * Gets comma-separated list of terms available to edit for the given post ID.
  *
  * @since 2.8.0
  *
@@ -298,7 +298,7 @@ function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 }
 
 /**
- * Add a new term to the database if it does not already exist.
+ * Adds a new term to the database if it does not already exist.
  *
  * @since 2.8.0
  *

src/wp-content/themes/twentynineteen/style-editor.css

@@ -1059,7 +1059,7 @@ figcaption,
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
   font-size: 0.71111em;
   line-height: 1.6;
-  color: #767676;
+  color: inherit;
 }
 
 /** === Pullquote === */

src/wp-content/themes/twentynineteen/style-editor.scss

@@ -443,7 +443,7 @@ figcaption,
 		@include font-family( $font__heading );
 		font-size: $font__size-xs;
 		line-height: 1.6;
-		color: $color__text-light;
+		color: inherit;
 	}
 }
 

src/wp-content/themes/twentytwentyone/assets/css/style-editor.css

@@ -1561,7 +1561,7 @@ pre.wp-block-preformatted {
 }
 
 .wp-block-quote .wp-block-quote__citation {
-	color: var(--global--color-primary);
+	color: currentColor;
 	font-size: var(--global--font-size-xs);
 	font-style: var(--quote--font-style-cite);
 }

src/wp-content/themes/twentytwentyone/assets/sass/05-blocks/quote/_editor.scss

@@ -23,7 +23,7 @@
 	}
 
 	.wp-block-quote__citation {
-		color: var(--global--color-primary);
+		color: currentColor;
 		font-size: var(--global--font-size-xs);
 		font-style: var(--quote--font-style-cite);
 

src/wp-includes/PHPMailer/PHPMailer.php

@@ -750,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.6.0';
+    const VERSION = '6.6.2';
 
     /**
      * Error severity: message only, continue processing.
@@ -1066,18 +1066,20 @@ public function addReplyTo($address, $name = '')
      * Addresses that have been added already return false, but do not throw exceptions.
      *
      * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
-     * @param string $address The email address to send, resp. to reply to
-     * @param string $name
+     * @param string $address The email address
+     * @param string $name    An optional username associated with the address
      *
      * @throws Exception
      *
      * @return bool true on success, false if address already used or invalid in some way
      */
     protected function addOrEnqueueAnAddress($kind, $address, $name)
     {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        $pos = strrpos($address, '@');
+        $pos = false;
+        if ($address !== null) {
+            $address = trim($address);
+            $pos = strrpos($address, '@');
+        }
         if (false === $pos) {
             //At-sign is missing.
             $error_message = sprintf(
@@ -1094,8 +1096,14 @@ protected function addOrEnqueueAnAddress($kind, $address, $name)
 
             return false;
         }
+        if ($name !== null) {
+            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        } else {
+            $name = '';
+        }
         $params = [$kind, $address, $name];
         //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        //Domain is assumed to be whatever is after the last @ symbol in the address
         if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
             if ('Reply-To' !== $kind) {
                 if (!array_key_exists($address, $this->RecipientsQueue)) {