From 35c5d672685d57fd13c9ab9822baa1b699f100e2 Mon Sep 17 00:00:00 2001 From: Davit Barbakadze Date: Fri, 27 Jun 2014 15:03:55 +0400 Subject: [PATCH] Straighten active plugin/file picking logic in plugin-editor.php. Address 24122. --- wp-admin/plugin-editor.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index 1c24295..231be43 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -36,17 +36,15 @@ if ( empty( $plugins ) ) { exit; } -if ( $file ) { - $plugin = $file; -} elseif ( empty( $plugin ) ) { +if ( empty( $plugin ) ) { $plugin = array_keys($plugins); $plugin = $plugin[0]; } -$plugin_files = get_plugin_files($plugin); - if ( empty($file) ) - $file = $plugin_files[0]; + $file = $plugin; + +$plugin_files = get_plugin_files($file); $file = validate_file_to_edit($file, $plugin_files); $real_file = WP_PLUGIN_DIR . '/' . $file; -- 1.8.4.2