Ticket #36455: 36455.7.diff

wp-admin/includes/file.php

@@ -1727 +1727 @@
         $from = trailingslashit( $from );
         $to   = trailingslashit( $to );
 
+        $opcacheEnabled = function_exists( 'opcache_invalidate' );
+
         foreach ( (array) $dirlist as $filename => $fileinfo ) {
                 if ( in_array( $filename, $skip_list, true ) ) {
                         continue;
@@ -1740 +1742 @@
                                         return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
                                 }
                         }
+                        if ($opcacheEnabled && in_array( pathinfo( $filename, PATHINFO_EXTENSION ), array( 'php', 'phtml' ) ) ) {
+                                opcache_invalidate( $to . $filename );
+                        }
                 } elseif ( 'd' == $fileinfo['type'] ) {
                         if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
                                 if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {

wp-admin/includes/update-core.php

@@ -1338 +1338 @@
         $from = trailingslashit( $from );
         $to   = trailingslashit( $to );
 
+    $opcacheEnabled = function_exists( 'opcache_invalidate' );
+
         foreach ( (array) $dirlist as $filename => $fileinfo ) {
                 if ( in_array( $filename, $skip_list, true ) ) {
                         continue;
@@ -1351 +1353 @@
                                         return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
                                 }
                         }
+                        if ($opcacheEnabled && in_array( pathinfo( $filename, PATHINFO_EXTENSION ), array( 'php', 'phtml' ) ) ) {
+                                opcache_invalidate( $to . $filename );
+                        }
                 } elseif ( 'd' == $fileinfo['type'] ) {
                         if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
                                 if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {