Merge branch 'release/1.7.3+dev'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ClassicPress",
-  "version": "1.7.2+dev",
+  "version": "1.7.3+dev",
   "description": "ClassicPress is web software you can use to create a beautiful website or blog.",
   "repository": {
     "type": "git",

src/license.txt

@@ -1,6 +1,6 @@
 ClassicPress - Web publishing software
 
-Copyright © 2018-2023 ClassicPress and contributors
+Copyright © 2018-2024 ClassicPress and contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ and
 
   WordPress - Web publishing software
 
-  Copyright 2003-2023 by the WordPress contributors
+  Copyright 2003-2024 by the WordPress contributors
 
   WordPress is released under the GPL
 

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'
 				);
 				?>

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

src/wp-admin/includes/dashboard.php

@@ -1473,11 +1473,7 @@ function cp_dashboard_upgrade() {
 
 	$core_updates = get_core_updates( array( 'dismissed' => true ) );
 
-	if ( ! empty( $core_updates ) && version_compare( $core_updates[0]->current, '2.0.0' ) >= 0 ) {
-		echo '<p>' . sprintf( __( 'Version 2.0.0 has now been released. <a href="%s">Upgrade</a> as soon as you are ready and read more about the release on our <a href="%s">forum</a>.' ), esc_url( admin_url( 'update-core.php' ) ), esc_url( 'https://forums.classicpress.net/c/announcements/release-notes/48' ) ) . '</p>';
-	} else {
-		echo '<p>' . sprintf( __( 'You can continue to use ClassicPress %s at this time. You will be notified when a new version is available that supports future versions of PHP. <a href="%s">Learn more</a> about testing version 2.0.0.' ), $display_version, esc_url( 'https://www.classicpress.net/help-test-classicpress-v2/' ) ) . '</p>';
-	}
+	echo '<p>' . sprintf( __( 'Version 2.0.0 has now been released. <a href="%s">Upgrade</a> as soon as you are ready and read more about the release on our <a href="%s">forum</a>.' ), esc_url( 'https://www.classicpress.net/announcing-bella-version-2-of-classicpress/' ), esc_url( 'https://forums.classicpress.net/c/announcements/release-notes/48' ) ) . '</p>';
 
 	echo '<p>' . __( '<strong>Deprecation notice:</strong> Version 1.6 is the last version to support PHP 5.6 - 7.3. The minimum required version for 2.0.0 will be PHP 7.4.' ) . '</p>';
 	echo '<p>' . __( '<strong>Deprecation notice:</strong> Version 1.7 is the last version to support XHTML. HTML5 will be the default doctype. Make sure your theme does not use XHTML. Themes will no longer need to declare HTML5 support using <code>add_theme_support( \'html5\', array() )</code> function.' ) . '</p>';

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 ) ) {

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';

src/wp-includes/class-fix-wpcli.php

@@ -19,15 +19,31 @@ class Fix_WPCLI {
 	 * @since CP-1.5.0
 	 */
 	public function __construct() {
+		WP_CLI::add_hook( 'after_wp_load', array( __CLASS__, 'add_cp_version_to_scope' ) );
 		WP_CLI::add_hook( 'before_invoke:core check-update', array( __CLASS__, 'correct_core_check_update' ) );
 	}
 
+	/**
+	 * Add $cp_version to scope.
+	 *
+	 * @since CP-1.7.3
+	 */
+	public static function add_cp_version_to_scope() {
+		// Add $cp_version to scope.
+		if ( ! isset( $GLOBALS['cp_version'] ) ) {
+			global $cp_version;
+			require ABSPATH . WPINC . '/version.php';
+		}
+	}
+
 	/**
 	 * Fix wp core check-update command.
 	 *
 	 * @since CP-1.5.0
 	 */
 	public static function correct_core_check_update() {
+		// Add $cp_version to scope.
+		global $cp_version;
 
 		// Check for updates. Bail on error.
 		// When playing with versions, an empty array is returned if it's not on api.
@@ -71,12 +87,6 @@ public static function correct_core_check_update() {
 
 		$major = preg_match( '/ --major */', $current_command );
 
-		// Put $cp_version into scope.
-		if ( ! isset( $GLOBALS['cp_version'] ) ) {
-			global $cp_version;
-			require ABSPATH . WPINC . '/version.php';
-		}
-
 		// Prepare output array.
 		$table_output = array();
 
@@ -112,7 +122,6 @@ public static function correct_core_check_update() {
 		// Exit to prevent the core check-update command to continue his work.
 		exit;
 	}
-
 }
 
 new Fix_WPCLI();

src/wp-includes/version.php

@@ -27,7 +27,7 @@
  *
  * @global string $cp_version
  */
-$cp_version = '1.7.2+dev';
+$cp_version = '1.7.3+dev';
 
 /**
  * The WordPress version string
@@ -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.