Merge branch 'develop' into pr/268

ClassicPress · Feb 11, 2024 · 1220a33 · 1220a33
2 parents 481481a + 5a4ea21
commit 1220a33
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
@@ -156,7 +156,23 @@ classicpress_version()
 				<?php
 				printf(
 					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
+					__( '<strong>WordPress Version %s</strong> addressed some security issues.' ),
+					'4.9.25'
+				);
+				?>
+				<?php
+				printf(
+					/* translators: %s: HelpHub URL */
+					__( 'For more information, see <a href="%s">the blog post</a>.' ),
+					esc_url( __( 'https://wordpress.org/news/2024/01/wordpress-6-4-3-maintenance-and-security-release/' ) )
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: %s: WordPress version number */
+					__( '<strong>WordPress Version %s</strong> addressed some security issues.' ),
 					'4.9.24'
 				);
 				?>

diff --git a/src/wp-admin/includes/class-file-upload-upgrader.php b/src/wp-admin/includes/class-file-upload-upgrader.php
@@ -92,7 +92,7 @@ public function __construct( $form, $urlholder ) {
 				}
 			}
 
-			$this->filename = $_FILES[$form]['name'];
+			$this->filename = $_FILES[ $form ]['name'];
 			$this->package  = $file['file'];
 
 			// Construct the object array

diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php
@@ -563,7 +563,7 @@ function populate_options() {
 
 		$value = maybe_serialize( sanitize_option( $option, $value ) );
 
-		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
+		$insert .= $wpdb->prepare( '(%s, %s, %s)', $option, $value, $autoload );
 	}
 
 	if ( ! empty( $insert ) ) {

diff --git a/src/wp-admin/update.php b/src/wp-admin/update.php
@@ -163,7 +163,7 @@
 			wp_die( __( 'Only .zip archives may be uploaded.' ) );
 		}
 
-		$file_upload = new File_Upload_Upgrader('pluginzip', 'package');
+		$file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
 
 		$title        = __( 'Upload Plugin' );
 		$parent_file  = 'plugins.php';
@@ -290,7 +290,7 @@
 			wp_die( __( 'Only .zip archives may be uploaded.' ) );
 		}
 
-		$file_upload = new File_Upload_Upgrader('themezip', 'package');
+		$file_upload = new File_Upload_Upgrader( 'themezip', 'package' );
 
 		$title        = __( 'Upload Theme' );
 		$parent_file  = 'themes.php';

diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php
@@ -40,7 +40,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.24';
+$wp_version = '4.9.25';
 
 /**
  * Holds the ClassicPress DB revision, increments when changes are made to the ClassicPress DB schema.