Merge branch 'WordPress:trunk' into trunk

Author: sabernhardt

.git-blame-ignore-revs

@@ -0,0 +1,50 @@
+# Pinking shears
+a4789b3cc1cb59e5cd062670f4439f264c0d34f3 # [12042]
+fb4e38b0e750c0cab5eb4c50532da93e2d9882b3 # [15843]
+4b33a0e9c45d67c5f3123577262f73727444254a # [16438]
+fa33255b567df6b19ccc3a61824ad243db116993 # [16439]
+46d96c7704b978b9d070bfec1cb1a33e4caf46b0 # [18254]
+feaf2597bf16b1bd6b489a0e5680501f12990bee # [18276]
+9e7890c3f61781200b9337186d85cd4034edac61 # [18386]
+fd10e500e47ca1ae3280ac6817e725965f7fc0dc # [19054]
+6610e321e79d9b56c6fc496b6630dd2ac664a0d3 # [19528]
+d26f0a4c407a5d13a095c7676b397e51a959d82c # [19577]
+89e9bcc1d69ebbac01c8c4501f9066e421125e66 # [20000]
+8c50f982ea9784fe06844ce84b1a3297b1241442 # [20715]
+b6e23d7269e50296270f93dda96dacb118bee8b3 # [20944]
+48a3ec24c5ea7615431bde431098546674a0096c # [21070]
+2439e4d722f5093631c4bac9a45106ab33624aaa # [21381]
+56c4577feae624f7a3bf55d001295e0707c972b6 # [21486]
+680b671330327f2568549dec9460a2e942219d55 # [21492]
+dd39a3b3d2d1f792b6ed8e88b1fcc13877fbd8dd # [22491]
+6d8bce688f5215ad20133b2cefedc72ac5136be3 # [22634]
+05c0f14024a2bb8ef9bdfcb84589d04205f8ce24 # [23679]
+ece7a7714477142d4cdb3269d2f9ad3d5dab2e5f # [23780]
+687d1a2ce992a0e7e24675b506b85a57e42fe78e # [24303]
+45d2a20783460667f85d5fdced422efd54c33b72 # [24603]
+c8889d984fd98381d6f0bd3228972e93348f1266 # [25085]
+# 21da24227f2c0087c95f44c60b1bca65cedf0611 # [25824] includes a punctuation change
+30f822b8ee767c0b07fe1780f2829de0cba8c314 # [25880]
+1cdb0ac2fa5452e58d7a002b260d594a581af02e # [26475]
+37a37b5fc578d945376cf3b66b4a23265d6491f3 # [26597]
+bda43fd1071ed45ded3def7872866f62e40af9f5 # [26627]
+98fe4a5aedfdaa8c769bf2aaedc58eb63d342320 # [26631]
+d6e06a2ee5c15b19ca80b9162f3e19c06b5af34d # [26714]
+cfd5c395bb3ba810edaec6cf4483212181823d2e # [26851]
+2ec5e68249bdacee9ac0ce59fad91b1149244af8 # [27123]
+305e72859a4154fc96bac7774ab7808ead6a06d4 # [29169]
+ca32a2d410f954b6b40d23f3392ba53e62a3d9f1 # [29707]
+48a504cc50a16f60a395ace8d133130e3d6962f5 # [30047]
+b539bd985bdf2dde162f46fcbf14e51e46ff8be7 # [30372]
+9a3942ffd82b28a77982e0a0d1c2bb0b8a70ce44 # [30996]
+469164785ff8defefbfcdf972c57d9004c273256 # [31077]
+c4e9c64233166957cd1cbcc54ff54b1a02edd3b5 # [31623]
+f4f1b4821342fd1d58708356b3ec39d6fefe31ac # [33411]
+0ec540b946eaebebc7e8ee39a8e4738914e7f2a3 # [33627]
+0c5bd752629b0960c6f43ca212a64724e4f40346 # [34534]
+991feb70438e981290696fa2b4fbe2ea54696a02 # [34774]
+6911ff11308089eace23719fc50160d403081a8e # [35627]
+8df8cf2df14fe26174f97af5bb17d63f2e867231 # [42843]
+
+# Coding Standards
+8f95800d52c1736d651ae6e259f90ad4a0db2c3f # [42343]

src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -253,7 +253,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 
 	editor.addCommand( 'WP_Help', function() {
 		var access = tinymce.Env.mac ? __( 'Ctrl + Alt + letter:' ) : __( 'Shift + Alt + letter:' ),
-			meta = tinymce.Env.mac ? __( 'Cmd + letter:' ) : __( 'Ctrl + letter:' ),
+			meta = tinymce.Env.mac ? __( '⌘ + letter:' ) : __( 'Ctrl + letter:' ),
 			table1 = [],
 			table2 = [],
 			row1 = {},

src/js/_enqueues/wp/customize/controls.js

@@ -8334,6 +8334,33 @@
 				history.replaceState( {}, document.title, urlParser.href );
 			}
 
+			/**
+			 * Displays a Site Editor notification when a block theme is activated.
+			 *
+			 * @since 4.9.0
+			 *
+			 * @param {string} [notification] - A notification to display.
+			 * @return {void}
+			 */
+			function addSiteEditorNotification( notification ) {
+				api.notifications.add( new api.Notification( 'site_editor_block_theme_notice', {
+					message: notification,
+					type: 'info',
+					dismissible: false,
+					render: function() {
+						var notification = api.Notification.prototype.render.call( this ),
+							button = notification.find( 'button.switch-to-editor' );
+
+						button.on( 'click', function( event ) {
+							event.preventDefault();
+							location.assign( button.data( 'action' ) );
+						} );
+
+						return notification;
+					}
+				} ) );
+			}
+
 			/**
 			 * Dismiss autosave.
 			 *
@@ -8408,6 +8435,10 @@
 			if ( api.settings.changeset.latestAutoDraftUuid || api.settings.changeset.hasAutosaveRevision ) {
 				addAutosaveRestoreNotification();
 			}
+			var shouldDisplayBlockThemeNotification = !! parseInt( $( '#customize-info' ).data( 'block-theme' ), 10 );
+			if (shouldDisplayBlockThemeNotification) {
+				addSiteEditorNotification( api.l10n.blockThemeNotification );
+			}
 		})();
 
 		// Check if preview url is valid and load the preview frame.

src/wp-admin/css/customize-controls.css

@@ -1733,6 +1733,12 @@ p.customize-section-description {
 	font-weight: 400;
 }
 
+#customize-notifications-area .notification-message button.switch-to-editor {
+	display: block;
+	margin-top: 6px;
+	font-weight: 400;
+}
+
 #customize-theme-controls .control-panel-themes > .accordion-section-title:after {
 	display: none;
 }

src/wp-admin/css/list-tables.css

@@ -914,12 +914,26 @@ tr.inline-edit-row td,
 }
 
 .inline-edit-row .submit {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
 	clear: both;
 	padding: 0.5em;
 	margin: 0.5em 0 0;
 }
 
+.inline-edit-save.submit .button {
+	margin-right: 8px;
+}
+
+.inline-edit-save .spinner {
+	float: none;
+	margin: 0;
+}
+
 .inline-edit-row .notice-error {
+	box-sizing: border-box;
+	min-width: 100%;
 	margin-top: 1em;
 }
 

src/wp-admin/customize.php

@@ -222,7 +222,7 @@
 				<ul></ul>
 			</div>
 			<div class="wp-full-overlay-sidebar-content" tabindex="-1">
-				<div id="customize-info" class="accordion-section customize-info">
+				<div id="customize-info" class="accordion-section customize-info" data-block-theme="<?php echo (int) wp_is_block_theme(); ?>">
 					<div class="accordion-section-title">
 						<span class="preview-notice">
 						<?php
@@ -235,7 +235,7 @@
 					<div class="customize-panel-description">
 						<p>
 							<?php
-							_e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements.' );
+							_e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements. The Customizer is intended for use with non-block themes.' );
 							?>
 						</p>
 						<p>

src/wp-admin/includes/ajax-actions.php

@@ -3970,20 +3970,47 @@ function wp_ajax_crop_image() {
 			/** This filter is documented in wp-admin/includes/class-custom-image-header.php */
 			$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
 
-			$parent_url = wp_get_attachment_url( $attachment_id );
-			$url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
+			$parent_url      = wp_get_attachment_url( $attachment_id );
+			$parent_basename = wp_basename( $parent_url );
+			$url             = str_replace( $parent_basename, wp_basename( $cropped ), $parent_url );
 
 			$size       = wp_getimagesize( $cropped );
 			$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
+			// Get the original image's post to pre-populate the cropped image.
+			$original_attachment      = get_post( $attachment_id );
+			$sanitized_post_title     = sanitize_file_name( $original_attachment->post_title );
+			$use_original_title       = (
+				( '' !== trim( $original_attachment->post_title ) ) &&
+				/*
+				 * Check if the original image has a title other than the "filename" default,
+				 * meaning the image had a title when originally uploaded or its title was edited.
+				 */
+				( $parent_basename !== $sanitized_post_title ) &&
+				( pathinfo( $parent_basename, PATHINFO_FILENAME ) !== $sanitized_post_title )
+			);
+			$use_original_description = ( '' !== trim( $original_attachment->post_content ) );
+
 			$object = array(
-				'post_title'     => wp_basename( $cropped ),
-				'post_content'   => $url,
+				'post_title'     => $use_original_title ? $original_attachment->post_title : wp_basename( $cropped ),
+				'post_content'   => $use_original_description ? $original_attachment->post_content : $url,
 				'post_mime_type' => $image_type,
 				'guid'           => $url,
 				'context'        => $context,
 			);
 
+			// Copy the image caption attribute (post_excerpt field) from the original image.
+			if ( '' !== trim( $original_attachment->post_excerpt ) ) {
+				$object['post_excerpt'] = $original_attachment->post_excerpt;
+			}
+
+			// Copy the image alt text attribute from the original image.
+			if ( '' !== trim( $original_attachment->_wp_attachment_image_alt ) ) {
+				$object['meta_input'] = array(
+					'_wp_attachment_image_alt' => wp_slash( $original_attachment->_wp_attachment_image_alt ),
+				);
+			}
+
 			$attachment_id = wp_insert_attachment( $object, $cropped );
 			$metadata      = wp_generate_attachment_metadata( $attachment_id, $cropped );
 

src/wp-admin/includes/class-wp-debug-data.php

@@ -388,11 +388,6 @@ public static function debug_data() {
 				$site_count += get_blog_count( $network_id );
 			}
 
-			$info['wp-core']['fields']['user_count'] = array(
-				'label' => __( 'User count' ),
-				'value' => get_user_count(),
-			);
-
 			$info['wp-core']['fields']['site_count'] = array(
 				'label' => __( 'Site count' ),
 				'value' => $site_count,
@@ -402,15 +397,13 @@ public static function debug_data() {
 				'label' => __( 'Network count' ),
 				'value' => $network_query->found_networks,
 			);
-		} else {
-			$user_count = count_users();
-
-			$info['wp-core']['fields']['user_count'] = array(
-				'label' => __( 'User count' ),
-				'value' => $user_count['total_users'],
-			);
 		}
 
+		$info['wp-core']['fields']['user_count'] = array(
+			'label' => __( 'User count' ),
+			'value' => get_user_count(),
+		);
+
 		// WordPress features requiring processing.
 		$wp_dotorg = wp_remote_get( 'https://wordpress.org', array( 'timeout' => 10 ) );
 
@@ -1471,20 +1464,20 @@ public static function debug_data() {
 	}
 
 	/**
-	 * Returns the value of a MySQL variable.
+	 * Returns the value of a MySQL system variable.
 	 *
 	 * @since 5.9.0
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param string $var Name of the MySQL variable.
+	 * @param string $mysql_var Name of the MySQL system variable.
 	 * @return string|null The variable value on success. Null if the variable does not exist.
 	 */
-	public static function get_mysql_var( $var ) {
+	public static function get_mysql_var( $mysql_var ) {
 		global $wpdb;
 
 		$result = $wpdb->get_row(
-			$wpdb->prepare( 'SHOW VARIABLES LIKE %s', $var ),
+			$wpdb->prepare( 'SHOW VARIABLES LIKE %s', $mysql_var ),
 			ARRAY_A
 		);
 
@@ -1500,11 +1493,11 @@ public static function get_mysql_var( $var ) {
 	 *
 	 * @since 5.2.0
 	 *
-	 * @param array  $info_array Information gathered from the `WP_Debug_Data::debug_data` function.
-	 * @param string $type       The data type to return, either 'info' or 'debug'.
+	 * @param array  $info_array Information gathered from the `WP_Debug_Data::debug_data()` function.
+	 * @param string $data_type  The data type to return, either 'info' or 'debug'.
 	 * @return string The formatted data.
 	 */
-	public static function format( $info_array, $type ) {
+	public static function format( $info_array, $data_type ) {
 		$return = "`\n";
 
 		foreach ( $info_array as $section => $details ) {
@@ -1513,7 +1506,7 @@ public static function format( $info_array, $type ) {
 				continue;
 			}
 
-			$section_label = 'debug' === $type ? $section : $details['label'];
+			$section_label = 'debug' === $data_type ? $section : $details['label'];
 
 			$return .= sprintf(
 				"### %s%s ###\n\n",
@@ -1526,7 +1519,7 @@ public static function format( $info_array, $type ) {
 					continue;
 				}
 
-				if ( 'debug' === $type && isset( $field['debug'] ) ) {
+				if ( 'debug' === $data_type && isset( $field['debug'] ) ) {
 					$debug_data = $field['debug'];
 				} else {
 					$debug_data = $field['value'];
@@ -1547,7 +1540,7 @@ public static function format( $info_array, $type ) {
 					$value = $debug_data;
 				}
 
-				if ( 'debug' === $type ) {
+				if ( 'debug' === $data_type ) {
 					$label = $field_name;
 				} else {
 					$label = $field['label'];

src/wp-admin/includes/class-wp-filesystem-base.php

@@ -129,14 +129,13 @@ public function wp_lang_dir() {
 	 * @see WP_Filesystem_Base::wp_themes_dir()
 	 * @see WP_Filesystem_Base::wp_lang_dir()
 	 *
-	 * @param string $base The folder to start searching from.
-	 * @param bool   $echo True to display debug information.
-	 *                     Default false.
+	 * @param string $base    Optional. The folder to start searching from. Default '.'.
+	 * @param bool   $verbose Optional. True to display debug information. Default false.
 	 * @return string The location of the remote path.
 	 */
-	public function find_base_dir( $base = '.', $echo = false ) {
+	public function find_base_dir( $base = '.', $verbose = false ) {
 		_deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem_Base::abspath() or WP_Filesystem_Base::wp_*_dir()' );
-		$this->verbose = $echo;
+		$this->verbose = $verbose;
 		return $this->abspath();
 	}
 
@@ -151,13 +150,13 @@ public function find_base_dir( $base = '.', $echo = false ) {
 	 * @see WP_Filesystem_Base::wp_themes_dir()
 	 * @see WP_Filesystem_Base::wp_lang_dir()
 	 *
-	 * @param string $base The folder to start searching from.
-	 * @param bool   $echo True to display debug information.
+	 * @param string $base    Optional. The folder to start searching from. Default '.'.
+	 * @param bool   $verbose Optional. True to display debug information. Default false.
 	 * @return string The location of the remote path.
 	 */
-	public function get_base_dir( $base = '.', $echo = false ) {
+	public function get_base_dir( $base = '.', $verbose = false ) {
 		_deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem_Base::abspath() or WP_Filesystem_Base::wp_*_dir()' );
-		$this->verbose = $echo;
+		$this->verbose = $verbose;
 		return $this->abspath();
 	}
 

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

@@ -238,13 +238,13 @@ public function is_user_over_quota() {
 	}
 
 	/**
-	 * Replace newlines, tabs, and multiple spaces with a single space
+	 * Replace newlines, tabs, and multiple spaces with a single space.
 	 *
-	 * @param string $string
+	 * @param string $text
 	 * @return string
 	 */
-	public function min_whitespace( $string ) {
-		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
+	public function min_whitespace( $text ) {
+		return preg_replace( '|[\r\n\t ]+|', ' ', $text );
 	}
 
 	/**