diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php index 7ef49f1f1c..d7305589bf 100644 --- a/wp-admin/includes/class-core-upgrader.php +++ b/wp-admin/includes/class-core-upgrader.php @@ -161,6 +161,7 @@ class Core_Upgrader extends WP_Upgrader { } $wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE ); + wp_opcache_invalidate( ABSPATH . 'wp-admin/includes/update-core.php' ); require_once ABSPATH . 'wp-admin/includes/update-core.php'; if ( ! function_exists( 'update_core' ) ) { diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 08215e5d2b..ec01eb799a 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -498,9 +498,7 @@ function wp_edit_theme_plugin_file( $args ) { if ( false === $written ) { return new WP_Error( 'unable_to_write', __( 'Unable to write to file.' ) ); } - if ( 'php' === $extension && function_exists( 'opcache_invalidate' ) ) { - opcache_invalidate( $real_file, true ); - } + wp_opcache_invalidate( $real_file, true ); if ( $is_active && 'php' === $extension ) { @@ -608,9 +606,7 @@ function wp_edit_theme_plugin_file( $args ) { // Roll-back file change. file_put_contents( $real_file, $previous_content ); - if ( function_exists( 'opcache_invalidate' ) ) { - opcache_invalidate( $real_file, true ); - } + wp_opcache_invalidate( $real_file, true ); if ( ! isset( $result['message'] ) ) { $message = __( 'Something went wrong.' ); @@ -1743,6 +1739,7 @@ function copy_dir( $from, $to, $skip_list = array() ) { return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename ); } } + wp_opcache_invalidate( $to . $filename ); } elseif ( 'd' === $fileinfo['type'] ) { if ( ! $wp_filesystem->is_dir( $to . $filename ) ) { if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) { @@ -2277,3 +2274,75 @@ function wp_print_request_filesystem_credentials_modal() { 3.2 upgrade, as well as for those - * upgrading to 3.7+. + * This is a standalone copy of the `copy_dir()` function that is used to + * upgrade the core files. It is placed here so that the version of this + * function from the *new* WordPress version will be called. + * + * It was initially added for the 3.1 -> 3.2 upgrade. * * @ignore * @since 3.2.0 * @since 3.7.0 Updated not to use a regular expression for the skip list. * * @see copy_dir() + * @link https://core.trac.wordpress.org/ticket/17173 * * @global WP_Filesystem_Base $wp_filesystem * @@ -1355,6 +1359,11 @@ function _copy_dir( $from, $to, $skip_list = array() ) { return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename ); } } + + // `wp_opcache_invalidate()` only exists in WordPress 5.5, so don't run it when upgrading to 5.5. + if ( function_exists( 'wp_opcache_invalidate' ) ) { + wp_opcache_invalidate( $to . $filename ); + } } elseif ( 'd' === $fileinfo['type'] ) { if ( ! $wp_filesystem->is_dir( $to . $filename ) ) { if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 2f12fec3c4..50c2245815 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-48159'; +$wp_version = '5.5-alpha-48160'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.