Changeset 38745

Timestamp:

10/07/2016 04:57:49 PM (10 years ago)

Author:

swissspidy

Message:

Plugins: Correctly display the current plugin in the plugin editor.

When editing a plugin file, show the correct plugin as being edited in the dropdown with the correct activation status.

Props aniketpant, dd32, DrewAPicture, jayarjo, MattyRob, mt8.biz, solarissmoke, swissspidy, WraithKenny.
Fixes #24122, #17552.

File:

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

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

@@ -20 +20 @@
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
-
-wp_reset_vars( array( 'action', 'error', 'file', 'plugin' ) );
 
 $plugins = get_plugins();
@@ -37 +35 @@
 }
 
-if ( $file ) {
-        $plugin = $file;
-} elseif ( empty( $plugin ) ) {
-        $plugin = array_keys($plugins);
-        $plugin = $plugin[0];
+$file = '';
+$plugin = '';
+if ( isset( $_REQUEST['file'] ) ) {
+        $file = sanitize_text_field( $_REQUEST['file'] );
+}
+
+if ( isset( $_REQUEST['plugin'] ) ) {
+        $plugin = sanitize_text_field( $_REQUEST['plugin'] );
+}
+
+if ( empty( $plugin ) ) {
+        if ( $file ) {
+                $plugin = $file;
+        } else {
+                $plugin = array_keys( $plugins );
+                $plugin = $plugin[0];
+        }
 }
 
@@ -53 +63 @@
 $scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
-switch ( $action ) {
-
-case 'update':
+if ( isset( $_REQUEST['action'] ) && 'update' === $_REQUEST['action'] ) {
 
         check_admin_referer('edit-plugin_' . $file);
@@ -68 +76 @@
 
                 // Deactivate so we can test it.
-                if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
-                        if ( is_plugin_active($file) )
-                                deactivate_plugins($file, true);
+                if ( is_plugin_active( $plugin ) || isset( $_POST['phperror'] ) ) {
+                        if ( is_plugin_active( $plugin ) ) {
+                                deactivate_plugins( $plugin, true );
+                        }
 
                         if ( ! is_network_admin() ) {
@@ -78 +87 @@
                         }
 
-                        wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
+                        wp_redirect( add_query_arg( '_wpnonce', wp_create_nonce( 'edit-plugin-test_' . $file ), "plugin-editor.php?file=$file&plugin=$plugin&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide ) );
                         exit;
                 }
-                wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
-        } else {
-                wp_redirect( self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
+                wp_redirect( self_admin_url( "plugin-editor.php?file=$file&plugin=$plugin&a=te&scrollto=$scrollto" ) );
+        } else {
+                wp_redirect( self_admin_url( "plugin-editor.php?file=$file&plugin=$plugin&scrollto=$scrollto" ) );
         }
         exit;
 
-default:
+} else {
 
         if ( isset($_GET['liveupdate']) ) {
                 check_admin_referer('edit-plugin-test_' . $file);
 
-                $error = validate_plugin($file);
-                if ( is_wp_error($error) )
+                $error = validate_plugin( $plugin );
+
+                if ( is_wp_error( $error ) ) {
                         wp_die( $error );
-
-                if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
-                        activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
-
-                wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+                }
+
+                if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network( $file ) ) || ! is_plugin_active( $file ) ) {
+                        activate_plugin( $plugin, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) );
+                } // we'll override this later if the plugin can be included without fatal error
+
+                wp_redirect( self_admin_url("plugin-editor.php?file=$file&plugin=$plugin&a=te&scrollto=$scrollto") );
                 exit;
         }
@@ -264 +276 @@
                 <?php endif; ?>
 <?php if ( is_writeable($real_file) ) : ?>
-        <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
+        <?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>
         <?php } ?>
@@ -290 +302 @@
 </script>
 <?php
-        break;
-}
+}
+
 include(ABSPATH . "wp-admin/admin-footer.php");