WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade/Install: Invalidate OPcache for version.php during update. 

Invalidate OPcache for wp-content/version.php on update individually, since it's copied separately.

Props stodorovic, krstarica, cenay, desrosj, pbiron, sergeybiryukov, mikeschroder.

Reviewed by mikeschroder, SergeyBiryukov.
Merges [50460] and [50475] to the 5.7 branch.
Fixes #51686, #51281.
See #36455.



Built from https://develop.svn.wordpress.org/branches/5.7@50477


git-svn-id: http://core.svn.wordpress.org/branches/5.7@50088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mike Schroder 2021-03-02 18:21:03 +00:00
parent 1adcc5bb83
commit 41f4aae738
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/includes/update-core.php
View File

@ -937,7 +937,7 @@ function update_core( $from, $to ) {
* Import $wp_version, $required_php_version, and $required_mysql_version from the new version. * Import $wp_version, $required_php_version, and $required_mysql_version from the new version.
* DO NOT globalise any variables imported from `version-current.php` in this function. * DO NOT globalise any variables imported from `version-current.php` in this function.
* *
* BC Note: $wp_filesystem->wp_content_dir() returned unslashed pre-2.8 * BC Note: $wp_filesystem->wp_content_dir() returned unslashed pre-2.8.
*/ */
$versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php'; $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) { if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
@ -946,6 +946,15 @@ function update_core( $from, $to ) {
} }
$wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE ); $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
/*
* `wp_opcache_invalidate()` only exists in WordPress 5.5 or later,
* so don't run it when upgrading from older versions.
*/
if ( function_exists( 'wp_opcache_invalidate' ) ) {
wp_opcache_invalidate( $versions_file );
}
require WP_CONTENT_DIR . '/upgrade/version-current.php'; require WP_CONTENT_DIR . '/upgrade/version-current.php';
$wp_filesystem->delete( $versions_file ); $wp_filesystem->delete( $versions_file );
@ -1117,6 +1126,14 @@ function update_core( $from, $to ) {
$result = new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' ); $result = new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' );
} }
$wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE ); $wp_filesystem->chmod( $to . 'wp-includes/version.php', FS_CHMOD_FILE );
/*
* `wp_opcache_invalidate()` only exists in WordPress 5.5 or later,
* so don't run it when upgrading from older versions.
*/
if ( function_exists( 'wp_opcache_invalidate' ) ) {
wp_opcache_invalidate( $to . 'wp-includes/version.php' );
}
} }
// Check to make sure everything copied correctly, ignoring the contents of wp-content. // Check to make sure everything copied correctly, ignoring the contents of wp-content.
@ -1373,7 +1390,10 @@ function _copy_dir( $from, $to, $skip_list = array() ) {
} }
} }
// `wp_opcache_invalidate()` only exists in WordPress 5.5, so don't run it when upgrading to 5.5. /*
* `wp_opcache_invalidate()` only exists in WordPress 5.5 or later,
* so don't run it when upgrading from older versions.
*/
if ( function_exists( 'wp_opcache_invalidate' ) ) { if ( function_exists( 'wp_opcache_invalidate' ) ) {
wp_opcache_invalidate( $to . $filename ); wp_opcache_invalidate( $to . $filename );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-RC1-50472'; $wp_version = '5.7-RC1-50477';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.