Changeset 50477

Timestamp:

03/02/2021 06:19:42 PM (5 years ago)

Author:

mikeschroder

Message:

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.

Location:

branches/5.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/update-core.php (modified) (4 diffs)

branches/5.7/src/wp-admin/includes/update-core.php

@@ -938 +938 @@
          * 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';
@@ -947 +947 @@
 
         $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';
         $wp_filesystem->delete( $versions_file );
@@ -1118 +1127 @@
                 }
                 $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' );
+                }
         }
 
@@ -1374 +1391 @@
                         }
 
-                        // `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' ) ) {
                                 wp_opcache_invalidate( $to . $filename );