Changeset 11029

Timestamp:

04/21/2009 07:17:44 PM (17 years ago)

Author:

ryan

Message:

Remember status and page when redirecting. see #9527

File:

• trunk/wp-admin/plugins.php (modified) (9 diffs)

trunk/wp-admin/plugins.php

@@ -21 +21 @@
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
 
-if( !empty($action) ) {
-    switch( $action ) {
+$status = isset($_REQUEST['plugin_status']) ? $_REQUEST['plugin_status'] : 'all';
+if ( !in_array($status, array('all', 'active', 'inactive', 'recent', 'upgrade', 'search')) )
+    $status = 'all';
+
+$page = isset($_REQUEST['paged']) ? $_REQUEST['paged'] : 1;
+
+if ( !empty($action) ) {
+    switch ( $action ) {
         case 'activate':
             check_admin_referer('activate-plugin_' . $plugin);
@@ -33 +39 @@
                 update_option('recently_activated', $recent);
             }
-            wp_redirect('plugins.php?activate=true'); // overrides the ?error=true one above
+            wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page"); // overrides the ?error=true one above
             exit;
             break;
@@ -48 +54 @@
                 update_option('recently_activated', $recent);
 
-            wp_redirect('plugins.php?activate-multi=true');
+            wp_redirect("plugins.php?activate-multi=true&plugin_status=$status&paged=$page");
             exit;
             break;
@@ -66 +72 @@
             deactivate_plugins($plugin);
             update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
-            wp_redirect('plugins.php?deactivate=true');
+            wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page");
             exit;
             break;
@@ -76 +82 @@
                 $deactivated[ $plugin ] = time();
             update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
-            wp_redirect('plugins.php?deactivate-multi=true');
+            wp_redirect("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page");
             exit;
             break;
@@ -272 +278 @@
             return false;
     }
-    $_GET['plugin_status'] = 'search';
+    $status = 'search';
     $search_plugins = array_filter($all_plugins, '_search_plugins_filter_callback');
     $total_search_plugins = count($search_plugins);
 }
 
-$status = isset($_GET['plugin_status']) ? $_GET['plugin_status'] : 'all';
-if ( !in_array($status, array('all', 'active', 'inactive', 'recent', 'upgrade', 'search')) )
-    $status = 'all';
 $plugin_array_name = "${status}_plugins";
 $plugins = &$$plugin_array_name;
 
 //Paging.
-$page = isset($_GET['paged']) ? $_GET['paged'] : 1;
 $total_this_page = "total_{$status}_plugins";
 $total_this_page = $$total_this_page;
@@ -316 +318 @@
  */
 function print_plugins_table($plugins, $context = '') {
+    global $page;
 ?>
 <table class="widefat" cellspacing="0" id="<?php echo $context ?>-plugins-table">
@@ -349 +352 @@
 
         if ( $is_active )
-            $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
+            $actions[] = '<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>';
         else //Inactive or Recently deactivated
-            $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
+            $actions[] = '<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>';
 
         if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
@@ -425 +428 @@
 <form method="post" action="<?php echo admin_url('plugins.php') ?>">
 <?php wp_nonce_field('bulk-manage-plugins') ?>
+<input type="hidden" name="plugin_status" value="<?php echo attribute_escape($status) ?>" />
+<input type="hidden" name="paged" value="<?php echo attribute_escape($page) ?>" />
 
 <ul class="subsubsub">