From 27c4548f19a5affbf21777d7f18fee11e363d91d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 3 May 2023 15:46:22 +0000 Subject: [PATCH] General: Restore `strpos()` check in `wp-admin/load-styles.php`. This resolves a fatal error on PHP < 8.0, as `wp-includes/compat.php` is not loaded in this file, so `str_starts_with()` may not be available. Follow-up to [55703]. Props dd32, flixos90, DigTek. Fixes #58244. See #58012. Built from https://develop.svn.wordpress.org/trunk@55710 git-svn-id: http://core.svn.wordpress.org/trunk@55222 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/load-styles.php | 3 ++- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php index d75cfbe8d8..eb05554de2 100644 --- a/wp-admin/load-styles.php +++ b/wp-admin/load-styles.php @@ -73,7 +73,8 @@ foreach ( $load as $handle ) { $content = get_file( $path ) . "\n"; - if ( str_starts_with( $style->src, '/' . WPINC . '/css/' ) ) { + // str_starts_with() is not used here, as wp-includes/compat.php is not loaded in this file. + if ( 0 === strpos( $style->src, '/' . WPINC . '/css/' ) ) { $content = str_replace( '../images/', '../' . WPINC . '/images/', $content ); $content = str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content ); $content = str_replace( '../fonts/', '../' . WPINC . '/fonts/', $content ); diff --git a/wp-includes/version.php b/wp-includes/version.php index bffa285efa..5f47cc00a3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55709'; +$wp_version = '6.3-alpha-55710'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.