Update to WordPress 6.4.1. For more information, see https://wordpres…

…s.org/news/2023/11/wordpress-6-4-1-maintenance-release/
pantheon-systems · Nov 9, 2023 · 3a4e6be · 3a4e6be
1 parent 7a1a6f3
commit 3a4e6be
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 92 deletions.
diff --git a/wp-admin/about.php b/wp-admin/about.php
@@ -43,6 +43,37 @@
 			<a href="contribute.php" class="nav-tab"><?php _e( 'Get Involved' ); ?></a>
 		</nav>
 
+		<div class="about__section changelog has-subtle-background-color">
+			<div class="column">
+				<h2><?php _e( 'Maintenance Release' ); ?></h2>
+				<p>
+					<?php
+					printf(
+						/* translators: 1: WordPress version number, 2: Plural number of bugs. */
+						_n(
+							'<strong>Version %1$s</strong> addressed %2$s bug.',
+							'<strong>Version %1$s</strong> addressed %2$s bugs.',
+							10
+						),
+						'6.4.1',
+						'4'
+					);
+					?>
+					<?php
+					printf(
+						/* translators: %s: HelpHub URL. */
+						__( 'For more information, see <a href="%s">the release notes</a>.' ),
+						sprintf(
+							/* translators: %s: WordPress version. */
+							esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
+							sanitize_title( '6.4.1' )
+						)
+					);
+					?>
+				</p>
+			</div>
+		</div>
+
 		<div class="about__section">
 			<div class="column">
 				<h2 class="aligncenter">

diff --git a/wp-admin/css/list-tables-rtl.css b/wp-admin/css/list-tables-rtl.css
@@ -1148,17 +1148,6 @@ ul.cat-checklist {
 	overflow-y: scroll;
 }
 
-ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
-	content: '';
-	border-top: 2px solid grey;
-	width: 65%;
-	height: 2px;
-	position: absolute;
-	top: calc( 50% + 1px );
-	right: 50%;
-	transform: translate( 50%, -50% );
-}
-
 #bulk-titles .ntdelbutton,
 #bulk-titles .ntdeltitle,
 .inline-edit-row fieldset ul.cat-checklist label {

diff --git a/wp-admin/css/list-tables-rtl.min.css b/wp-admin/css/list-tables-rtl.min.css
diff --git a/wp-admin/css/list-tables.css b/wp-admin/css/list-tables.css
@@ -1147,17 +1147,6 @@ ul.cat-checklist {
 	overflow-y: scroll;
 }
 
-ul.cat-checklist input[name="post_category[]"]:indeterminate::before {
-	content: '';
-	border-top: 2px solid grey;
-	width: 65%;
-	height: 2px;
-	position: absolute;
-	top: calc( 50% + 1px );
-	left: 50%;
-	transform: translate( -50%, -50% );
-}
-
 #bulk-titles .ntdelbutton,
 #bulk-titles .ntdeltitle,
 .inline-edit-row fieldset ul.cat-checklist label {

diff --git a/wp-admin/css/list-tables.min.css b/wp-admin/css/list-tables.min.css
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
@@ -649,21 +649,8 @@ function bulk_edit_posts( $post_data = null ) {
 		}
 
 		if ( isset( $new_cats ) && in_array( 'category', $tax_names, true ) ) {
-			$cats = (array) wp_get_post_categories( $post_id );
-
-			if (
-				isset( $post_data['indeterminate_post_category'] )
-				&& is_array( $post_data['indeterminate_post_category'] )
-			) {
-				$indeterminate_post_category = $post_data['indeterminate_post_category'];
-			} else {
-				$indeterminate_post_category = array();
-			}
-
-			$indeterminate_cats         = array_intersect( $cats, $indeterminate_post_category );
-			$determinate_cats           = array_diff( $new_cats, $indeterminate_post_category );
-			$post_data['post_category'] = array_unique( array_merge( $indeterminate_cats, $determinate_cats ) );
-
+			$cats                       = (array) wp_get_post_categories( $post_id );
+			$post_data['post_category'] = array_unique( array_merge( $cats, $new_cats ) );
 			unset( $post_data['tax_input']['category'] );
 		}
 

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
@@ -1018,8 +1018,8 @@ function wp_import_upload_form( $action ) {
 		wp_admin_notice(
 			$upload_directory_error,
 			array(
-				'additonal_classes' => array( 'error' ),
-				'paragraph_wrap'    => false,
+				'additional_classes' => array( 'error' ),
+				'paragraph_wrap'     => false,
 			)
 		);
 	else :

diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
@@ -345,9 +345,9 @@ function update_nag() {
 	wp_admin_notice(
 		$msg,
 		array(
-			'type'              => 'warning',
-			'additonal_classes' => array( 'update-nag', 'inline' ),
-			'paragraph_wrap'    => false,
+			'type'               => 'warning',
+			'additional_classes' => array( 'update-nag', 'inline' ),
+			'paragraph_wrap'     => false,
 		)
 	);
 }

diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js
@@ -178,9 +178,6 @@ window.wp = window.wp || {};
 	 */
 	setBulk : function(){
 		var te = '', type = this.type, c = true;
-		var checkedPosts = $( 'tbody th.check-column input[type="checkbox"]:checked' );
-		var categories = {};
-		var indeterminatePostCategoryField = $( '<input type="hidden" name="indeterminate_post_category[]">' );
 		this.revert();
 
 		$( '#bulk-edit td' ).attr( 'colspan', $( 'th:visible, td:visible', '.widefat:first thead' ).length );
@@ -220,45 +217,6 @@ window.wp = window.wp || {};
 		// Populate the list of items to bulk edit.
 		$( '#bulk-titles' ).html( '<ul id="bulk-titles-list" role="list">' + te + '</ul>' );
 
-		// Gather up some statistics on which of these checked posts are in which categories.
-		checkedPosts.each( function() {
-			var id      = $( this ).val();
-			var checked = $( '#category_' + id ).text().split( ',' );
-
-			checked.map( function( cid ) {
-				categories[ cid ] || ( categories[ cid ] = 0 );
-				// Just record that this category is checked.
-				categories[ cid ]++;
-			} );
-		} );
-
-		// Compute initial states.
-		$( '.inline-edit-categories input[name="post_category[]"]' ).each( function() {
-			// Clear indeterminate states.
-			$( '<input type="hidden" name="indeterminate_post_category[]">' ).remove();
-
-			if ( categories[ $( this ).val() ] == checkedPosts.length ) {
-				// If the number of checked categories matches the number of selected posts, then all posts are in this category.
-				$( this ).prop( 'checked', true );
-			} else if ( categories[ $( this ).val() ] > 0 ) {
-				// If the number is less than the number of selected posts, then it's indeterminate.
-				$( this ).prop( 'indeterminate', true );
-
-				// Set indeterminate states for the backend.
-				indeterminatePostCategoryField.val( $( this ).val() );
-				$( this ).after( indeterminatePostCategoryField );
-			}
-		} );
-
-		$( '.inline-edit-categories input[name="post_category[]"]' ).on( 'change', function() {
-			// Remove the indeterminate flags as there was a specific state change.
-			$( this ).parent().find( 'input[name="indeterminate_post_category[]"]' ).remove();
-		} );
-
-		$( '.inline-edit-save button' ).on( 'click', function() {
-			$( '.inline-edit-categories input[name="post_category[]"]' ).prop( 'indeterminate', false );
-		} );
-
 		/**
 		 * Binds on click events to handle the list of items to bulk edit.
 		 *

diff --git a/wp-admin/js/inline-edit-post.min.js b/wp-admin/js/inline-edit-post.min.js
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
@@ -195,7 +195,7 @@
 		__( 'File edited successfully.' ),
 		array(
 			'id'                 => 'message',
-			'is-dismissible'     => true,
+			'dismissible'        => true,
 			'additional_classes' => array( 'updated' ),
 		)
 	);

diff --git a/wp-includes/Requests/src/Requests.php b/wp-includes/Requests/src/Requests.php
@@ -148,7 +148,7 @@ class Requests {
 	 *
 	 * @var string
 	 */
-	const VERSION = '2.0.8';
+	const VERSION = '2.0.9';
 
 	/**
 	 * Selected transport name

diff --git a/wp-includes/Requests/src/Transport/Curl.php b/wp-includes/Requests/src/Transport/Curl.php
@@ -25,7 +25,6 @@
 final class Curl implements Transport {
 	const CURL_7_10_5 = 0x070A05;
 	const CURL_7_16_2 = 0x071002;
-	const CURL_7_22_0 = 0x071600;
 
 	/**
 	 * Raw HTTP data
@@ -364,7 +363,7 @@ private function setup_handle($url, $headers, $data, $options) {
 		$options['hooks']->dispatch('curl.before_request', [&$this->handle]);
 
 		// Force closing the connection for old versions of cURL (<7.22).
-		if ($this->version < self::CURL_7_22_0 && !isset($headers['Connection'])) {
+		if (!isset($headers['Connection'])) {
 			$headers['Connection'] = 'close';
 		}
 

diff --git a/wp-includes/class-wpdb.php b/wp-includes/class-wpdb.php
@@ -690,6 +690,21 @@ class wpdb {
 	 */
 	private $allow_unsafe_unquoted_parameters = true;
 
+	/**
+	 * Whether to use the mysqli extension over mysql. This is no longer used as the mysql
+	 * extension is no longer supported.
+	 *
+	 * Default true.
+	 *
+	 * @since 3.9.0
+	 * @since 6.4.0 This property was removed.
+	 * @since 6.4.1 This property was reinstated and its default value was changed to true.
+	 *              The property is no longer used in core but may be accessed externally.
+	 *
+	 * @var bool
+	 */
+	private $use_mysqli = true;
+
 	/**
 	 * Whether we've managed to successfully connect at some point.
 	 *

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4';
+$wp_version = '6.4.1';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.