Changeset 15697

Timestamp:

10/04/2010 04:26:58 AM (16 years ago)

Author:

dd32

Message:

Preserve search terms on plugin management pages during actions. Fixes #14905 for trunk.

Location:

trunk/wp-admin

Files:

• includes/default-list-tables.php (modified) (2 diffs)
• plugins.php (modified) (10 diffs)

trunk/wp-admin/includes/default-list-tables.php

@@ -3508 +3508 @@
 
         function display_rows() {
-                global $status, $page;
+                global $status, $page, $s;
 
                 $context = $status;
@@ -3558 +3558 @@
                                         if ( $is_active_for_network ) {
                                                 if ( current_user_can( 'manage_network_plugins' ) )
-                                                        $actions['network_deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+                                                        $actions['network_deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
                                         } else {
                                                 if ( current_user_can( 'manage_network_plugins' ) )
-                                                        $actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
+                                                        $actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
                                                 if ( current_user_can('delete_plugins') )
-                                                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+                                                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                                         }
                                 } else {
                                         if ( $is_active ) {
-                                                $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
+                                                $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
                                         } else {
                                                 if ( is_network_only_plugin( $plugin_file ) && !is_network_admin() )
                                                         continue;
 
-                                                $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
+                                                $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
 
                                                 if ( current_user_can('delete_plugins') )
-                                                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+                                                        $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                                         } // end if $is_active
                                  } // end if is_network_admin()

trunk/wp-admin/plugins.php

@@ -16 +16 @@
 
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
+$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
@@ -35 +36 @@
                         if ( is_wp_error( $result ) ) {
                                 if ( 'unexpected_output' == $result->get_error_code() ) {
-                                        $redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin;
+                                        $redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s";
                                         wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
                                         exit;
@@ -51 +52 @@
                                 wp_redirect("import.php?import=" . str_replace('-importer', '', dirname($plugin)) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix
                         } else {
-                                wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page"); // overrides the ?error=true one above
+                                wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s"); // overrides the ?error=true one above
                         }
                         exit;
@@ -65 +66 @@
                         $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
                         if ( empty($plugins) ) {
-                                wp_redirect("plugins.php?plugin_status=$status&paged=$page");
+                                wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
                                 exit;
                         }
@@ -78 +79 @@
                         update_option('recently_activated', $recent);
 
-                        wp_redirect("plugins.php?activate-multi=true&plugin_status=$status&paged=$page");
+                        wp_redirect("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s");
                         exit;
                         break;
@@ -144 +145 @@
                         update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
                         if (headers_sent())
-                                echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page" ) . "' />";
+                                echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
                         else
-                                wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page");
+                                wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s");
                         exit;
                         break;
@@ -158 +159 @@
                         $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
                         if ( empty($plugins) ) {
-                                wp_redirect("plugins.php?plugin_status=$status&paged=$page");
+                                wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
                                 exit;
                         }
@@ -169 +170 @@
 
                         update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
-                        wp_redirect("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page");
+                        wp_redirect("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s");
                         exit;
                         break;
@@ -182 +183 @@
                         $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); //Do not allow to delete Activated plugins.
                         if ( empty($plugins) ) {
-                                wp_redirect("plugins.php?plugin_status=$status&paged=$page");
+                                wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
                                 exit;
                         }
@@ -276 +277 @@
 
                         set_transient('plugins_delete_result_'.$user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
-                        wp_redirect("plugins.php?deleted=true&plugin_status=$status&paged=$page");
+                        wp_redirect("plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s");
                         exit;
                         break;