Changeset 48160

Timestamp:

06/25/2020 07:13:22 AM (4 years ago)

Author:

mikeschroder

Message:

Upgrade/Install: Invalidate OPcache for PHP files during updates.

When files are copied into place, check whether opcode invalidation is available and attempt to invalidate to avoid unintended behavior or fatal errors from themes, plugins, or core.

Introduces wp_opcache_invalidate() to allow safe invalidation of PHP files from opcode cache, and a filter, wp_opcache_invalidate_file to override the behavior.

Replaces the existing calls to opcache_invalidate() in the plugin and theme editors to use the new function.

Thanks to jnylen0 for porting over a patch from ClassicPress that provided much of the approach for what is being committed.

Props nigro.simone, dd32, JasWSInc, szepe.viktor, swissspidy, JanR, asalce, Garavani, pavelevap, pputzer, GregLone, benoitchantre, jadonn, doc987, kraftbj, Krstarica, jnylen0, nextendweb, williampatton, ayeshrajans, joostdevalk, stevenkussmaul, boogah, jorbin, mikeschroder.
Fixes #36455, #50354.

Location:

trunk/src/wp-admin/includes

Files:

• class-core-upgrader.php (modified) (1 diff)
• file.php (modified) (4 diffs)
• update-core.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-core-upgrader.php

@@ -162 +162 @@
         $wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE );
 
+
         require_once ABSPATH . 'wp-admin/includes/update-core.php';
 

trunk/src/wp-admin/includes/file.php

@@ -499 +499 @@
         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 ) {
@@ -609 +607 @@
             // 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'] ) ) {
@@ -1744 +1740 @@
                 }
             }
+
         } elseif ( 'd' === $fileinfo['type'] ) {
             if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
@@ -2278 +2275 @@
     <?php
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1319 +1319 @@
  * Assumes that WP_Filesystem() has already been called and setup.
  *
- * This is a temporary function for the 3.1 -> 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
@@ -1327 +1330 @@
  *
  * @see copy_dir()
+
  *
  * @global WP_Filesystem_Base $wp_filesystem
@@ -1355 +1359 @@
                     return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
                 }
+
+
+
+
+
             }
         } elseif ( 'd' === $fileinfo['type'] ) {