Changeset 41560 for trunk/src/wp-admin/plugin-editor.php

Timestamp:

09/22/2017 01:35:09 AM (8 years ago)

Author:

westonruter

Message:

Plugin Editor: Improve reliability of detecting PHP fatal errors when editing an active plugin.

• Invalidate PHP opcache after file is updated to ensure include will include the written changes.
• Define WP_ADMIN when activating plugin in sandbox so plugin code targeting admin will be loaded.
• Do actions that get triggered when loading the admin to ensure plugin code runs that could cause errors on plugin editor screen (and lock out access).
• Fix ability to re-activate a plugin after editing a PHP file other than the main plugin file, and ensure PHP fatal error will be displayed in such cases.
• Consolidate duplicated code into plugin_sandbox_scrape() and re-use in activate_plugin().
• Show an error notice instead of a success notice when a file is updated but a plugin was deactivated due to a fatal error.
• Update style of warning when editing an active plugin to be styled as an actual warning notice.

See #12423, #21622.
Fixes #39766.

File:

• trunk/src/wp-admin/plugin-editor.php (modified) (4 diffs)

trunk/src/wp-admin/plugin-editor.php

@@ -47 +47 @@
 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 plugin.
+        if ( empty( $plugin ) ) {
+            $plugin = $file;
+        }
     } else {
         $plugin = array_keys( $plugins );
@@ -72 +85 @@
         fwrite($f, $newcontent);
         fclose($f);
+
+        if ( preg_match( '/\.php$/', $real_file ) && function_exists( 'opcache_invalidate' ) ) {
+            opcache_invalidate( $real_file, true );
+        }
 
         $network_wide = is_plugin_active_for_network( $file );
@@ -221 +238 @@
  <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' ) );
@@ -316 +333 @@
 <?php if ( is_writeable($real_file) ) : ?>
     <?php if ( in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) ) { ?>
-        <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
+        <div class="notice notice-warning inline active-plugin-edit-warning">
+            <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
+        </div>
     <?php } ?>
     <p class="submit">