diff -r 7b1b88e27a20 -r 48c4eec2b7e6 wp/wp-admin/includes/class-core-upgrader.php --- a/wp/wp-admin/includes/class-core-upgrader.php Thu Sep 29 08:06:27 2022 +0200 +++ b/wp/wp-admin/includes/class-core-upgrader.php Fri Sep 05 18:40:08 2025 +0200 @@ -21,7 +21,7 @@ class Core_Upgrader extends WP_Upgrader { /** - * Initialize the upgrade strings. + * Initializes the upgrade strings. * * @since 2.8.0 */ @@ -30,16 +30,16 @@ $this->strings['locked'] = __( 'Another update is currently in progress.' ); $this->strings['no_package'] = __( 'Update package not available.' ); /* translators: %s: Package URL. */ - $this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s…' ), '%s' ); + $this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s…' ), '%s' ); $this->strings['unpack_package'] = __( 'Unpacking the update…' ); $this->strings['copy_failed'] = __( 'Could not copy files.' ); $this->strings['copy_failed_space'] = __( 'Could not copy files. You may have run out of disk space.' ); - $this->strings['start_rollback'] = __( 'Attempting to roll back to previous version.' ); - $this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' ); + $this->strings['start_rollback'] = __( 'Attempting to restore the previous version.' ); + $this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has been restored to your previous version.' ); } /** - * Upgrade WordPress core. + * Upgrades WordPress core. * * @since 2.8.0 * @@ -121,10 +121,12 @@ return new WP_Error( 'locked', $this->strings['locked'] ); } - $download = $this->download_package( $current->packages->$to_download, true ); + $download = $this->download_package( $current->packages->$to_download, false ); - // Allow for signature soft-fail. - // WARNING: This may be removed in the future. + /* + * Allow for signature soft-fail. + * WARNING: This may be removed in the future. + */ if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) { // Output the failure error as a normal feedback, and not as an error: /** This filter is documented in wp-admin/includes/update-core.php */ @@ -181,9 +183,9 @@ * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full. * do_rollback allows for update_core() to trigger a rollback if needed. */ - if ( false !== strpos( $error_code, 'do_rollback' ) ) { + if ( str_contains( $error_code, 'do_rollback' ) ) { $try_rollback = true; - } elseif ( false !== strpos( $error_code, '__copy_dir' ) ) { + } elseif ( str_contains( $error_code, '__copy_dir' ) ) { $try_rollback = true; } elseif ( 'disk_full' === $error_code ) { $try_rollback = true; @@ -323,7 +325,7 @@ } // Don't claim we can update on update-core.php if we have a non-critical failure logged. - if ( $wp_version === $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) { + if ( $wp_version === $failure_data['current'] && str_contains( $offered_ver, '.1.next.minor' ) ) { return false; } @@ -385,7 +387,7 @@ } /** - * Compare the disk file checksums against the expected checksums. + * Compares the disk file checksums against the expected checksums. * * @since 3.7.0 * @@ -405,7 +407,7 @@ foreach ( $checksums as $file => $checksum ) { // Skip files which get updated. - if ( 'wp-content' === substr( $file, 0, 10 ) ) { + if ( str_starts_with( $file, 'wp-content' ) ) { continue; } if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) {