Changeset 56088

Timestamp:

06/28/2023 10:07:49 AM (3 years ago)

Author:

azaozz

Message:

Revert use of str_starts_with() and str_contains() in update-core.php.

Fixes updating WordPress from 5.7 and earlier versions. When updating this file runs first in the old version where the polifills may not be available.

Props: ironprogrammer, SergeyBiryukov, dd32, azaozz.
See: #58206.

File:

• trunk/src/wp-admin/includes/update-core.php (modified) (5 diffs)

trunk/src/wp-admin/includes/update-core.php

@@ -1138 +1138 @@
         $wp_filesystem->delete( $versions_file );
 
-        $php_version       = PHP_VERSION;
-        $mysql_version     = $wpdb->db_version();
-        $old_wp_version    = $GLOBALS['wp_version']; // The version of WordPress we're updating from.
-        $development_build = ( str_contains( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release.
+        $php_version    = PHP_VERSION;
+        $mysql_version  = $wpdb->db_version();
+        $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from.
+        /*
+         * Note: str_contains() is not used here, as this file is included
+         * when updating from older WordPress versions, in which case
+         * the polyfills from wp-includes/compat.php may not be available.
+         */
+        $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release.
         $php_compat        = version_compare( $php_version, $required_php_version, '>=' );
 
@@ -1243 +1248 @@
                 if ( is_array( $checksums ) ) {
                         foreach ( $checksums as $file => $checksum ) {
-                                if ( str_starts_with( $file, 'wp-content' ) ) {
+                                /*
+                                 * Note: str_starts_with() is not used here, as this file is included
+                                 * when updating from older WordPress versions, in which case
+                                 * the polyfills from wp-includes/compat.php may not be available.
+                                 */
+                                if ( 'wp-content' === substr( $file, 0, 10 ) ) {
                                         continue;
                                 }
@@ -1350 +1360 @@
         if ( isset( $checksums ) && is_array( $checksums ) ) {
                 foreach ( $checksums as $file => $checksum ) {
-                        if ( str_starts_with( $file, 'wp-content' ) ) {
+                        /*
+                         * Note: str_starts_with() is not used here, as this file is included
+                         * when updating from older WordPress versions, in which case
+                         * the polyfills from wp-includes/compat.php may not be available.
+                         */
+                        if ( 'wp-content' === substr( $file, 0, 10 ) ) {
                                 continue;
                         }
@@ -1765 +1780 @@
 
         if ( file_exists( "{$directory}example.html" )
-                && str_contains( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' )
+                /*
+                 * Note: str_contains() is not used here, as this file is included
+                 * when updating from older WordPress versions, in which case
+                 * the polyfills from wp-includes/compat.php may not be available.
+                 */
+                && false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' )
         ) {
                 $files[] = "{$directory}example.html";
@@ -1774 +1794 @@
                 $dirs,
                 static function( $dir ) {
-                        // Skip any node_modules directories.
-                        return ! str_contains( $dir, 'node_modules' );
+                        /*
+                         * Skip any node_modules directories.
+                         *
+                         * Note: str_contains() is not used here, as this file is included
+                         * when updating from older WordPress versions, in which case
+                         * the polyfills from wp-includes/compat.php may not be available.
+                         */
+                        return false === strpos( $dir, 'node_modules' );
                 }
         );