Ticket #39766: 39766.1.diff

src/wp-admin/includes/plugin.php

@@ -557 +557 @@
                 ob_start();
                 wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
                 $_wp_plugin_file = $plugin;
+
+                if ( ! defined( 'WP_ADMIN' ) ) {
+                        define( 'WP_ADMIN', true );
+                }
+
+                $tested_actions = array(
+                        'plugins_loaded' => array(),
+                        'setup_theme' => array(),
+                        'after_setup_theme' => array(),
+                        'init' => array(),
+                        'wp_loaded' => array(),
+                        'admin_init' => array(),
+                );
+                array_map( 'remove_all_actions', array_keys( $tested_actions ) );
+
                 include_once( WP_PLUGIN_DIR . '/' . $plugin );
+
+                // Trigger key actions that are done on the plugin editor to cause the relevant plugin hooks to fire and potentially cause errors.
+                foreach ( $tested_actions as $action => $args ) {
+                        do_action_ref_array( $action, $args );
+                }
+
                 $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
 
                 if ( ! $silent ) {

src/wp-admin/plugin-editor.php

@@ -46 +46 @@
 
 if ( empty( $plugin ) ) {
         if ( $file ) {
-                $plugin = $file;
+
+                // Locate the plugin for a given plugin file being edited.
+                $file_dirname = dirname( $file );
+                foreach ( array_keys( $plugins ) as $plugin_candidate ) {
+                        if ( $plugin_candidate === $file || ( '.' !== $file_dirname && dirname( $plugin_candidate ) === $file_dirname ) ) {
+                                $plugin = $plugin_candidate;
+                                break;
+                        }
+                }
+
+                // Fallback to the file as the plugins.
+                if ( empty( $plugin ) ) {
+                        $plugin = $file;
+                }
         } else {
                 $plugin = array_keys( $plugins );
                 $plugin = $plugin[0];
@@ -72 +85 @@
                 fwrite($f, $newcontent);
                 fclose($f);
 
+                if ( function_exists( 'opcache_invalidate' ) ) {
+                        opcache_invalidate( $real_file, true );
+                }
+
                 $network_wide = is_plugin_active_for_network( $file );
 
                 // Deactivate so we can test it.
@@ -220 +237 @@
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
 <?php elseif (isset($_GET['phperror'])) : ?>
- <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
+ <div id="message" class="notice notice-error"><p><?php _e( 'This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.' ); ?></p>
         <?php
-                if ( wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $file ) ) {
+                if ( wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
                         $iframe_url = add_query_arg( array(
                                 'action'   => 'error_scrape',
-                                'plugin'   => urlencode( $file ),
+                                'plugin'   => urlencode( $plugin ),
                                 '_wpnonce' => urlencode( $_GET['_error_nonce'] ),
                         ), admin_url( 'plugins.php' ) );
                         ?>