<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15697] trunk/wp-admin:
Preserve search terms on plugin management pages during actions.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15697">15697</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-04 04:26:58 +0000 (Mon, 04 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Preserve search terms on plugin management pages during actions. Fixes <a href="http://trac.wordpress.org/ticket/14905">#14905</a> for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15696 => 15697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-10-04 04:16:33 UTC (rev 15696)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-10-04 04:26:58 UTC (rev 15697)
</span><span class="lines">@@ -3507,7 +3507,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function display_rows() {
</span><del>- global $status, $page;
</del><ins>+ global $status, $page, $s;
</ins><span class="cx">
</span><span class="cx"> $context = $status;
</span><span class="cx">
</span><span class="lines">@@ -3557,24 +3557,24 @@
</span><span class="cx"> if ( is_network_admin() ) {
</span><span class="cx"> if ( $is_active_for_network ) {
</span><span class="cx"> if ( current_user_can( 'manage_network_plugins' ) )
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> } else {
</span><span class="cx"> if ( current_user_can( 'manage_network_plugins' ) )
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> if ( current_user_can('delete_plugins') )
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if ( $is_active ) {
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> } else {
</span><span class="cx"> if ( is_network_only_plugin( $plugin_file ) && !is_network_admin() )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx">
</span><span class="cx"> if ( current_user_can('delete_plugins') )
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx"> } // end if $is_active
</span><span class="cx"> } // end if is_network_admin()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (15696 => 15697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-10-04 04:16:33 UTC (rev 15696)
+++ trunk/wp-admin/plugins.php 2010-10-04 04:26:58 UTC (rev 15697)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> $action = $wp_list_table->current_action();
</span><span class="cx">
</span><span class="cx"> $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
</span><ins>+$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
</ins><span class="cx">
</span><span class="cx"> // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
</span><span class="cx"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
</span><span class="lines">@@ -34,7 +35,7 @@
</span><span class="cx"> $result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin, $network_wide);
</span><span class="cx"> if ( is_wp_error( $result ) ) {
</span><span class="cx"> if ( 'unexpected_output' == $result->get_error_code() ) {
</span><del>- $redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin;
</del><ins>+ $redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s";
</ins><span class="cx"> wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
</span><span class="cx"> exit;
</span><span class="cx"> } else {
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
</span><span class="cx"> 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
</span><span class="cx"> } else {
</span><del>- wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page"); // overrides the ?error=true one above
</del><ins>+ wp_redirect("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s"); // overrides the ?error=true one above
</ins><span class="cx"> }
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><span class="cx"> $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); // Only activate plugins which are not already active.
</span><span class="cx"> if ( empty($plugins) ) {
</span><del>- wp_redirect("plugins.php?plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> update_option('recently_activated', $recent);
</span><span class="cx">
</span><del>- wp_redirect("plugins.php?activate-multi=true&plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'update-selected' :
</span><span class="lines">@@ -143,9 +144,9 @@
</span><span class="cx"> deactivate_plugins($plugin);
</span><span class="cx"> update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
</span><span class="cx"> if (headers_sent())
</span><del>- echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page" ) . "' />";
</del><ins>+ echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
</ins><span class="cx"> else
</span><del>- wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'deactivate-selected':
</span><span class="lines">@@ -157,7 +158,7 @@
</span><span class="cx"> $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
</span><span class="cx"> $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated.
</span><span class="cx"> if ( empty($plugins) ) {
</span><del>- wp_redirect("plugins.php?plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx"> $deactivated[ $plugin ] = time();
</span><span class="cx">
</span><span class="cx"> update_option('recently_activated', $deactivated + (array)get_option('recently_activated'));
</span><del>- wp_redirect("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'delete-selected':
</span><span class="lines">@@ -181,7 +182,7 @@
</span><span class="cx"> $plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
</span><span class="cx"> $plugins = array_filter($plugins, create_function('$plugin', 'return !is_plugin_active($plugin);') ); //Do not allow to delete Activated plugins.
</span><span class="cx"> if ( empty($plugins) ) {
</span><del>- wp_redirect("plugins.php?plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -275,7 +276,7 @@
</span><span class="cx"> $delete_result = delete_plugins($plugins);
</span><span class="cx">
</span><span class="cx"> 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
</span><del>- wp_redirect("plugins.php?deleted=true&plugin_status=$status&paged=$page");
</del><ins>+ wp_redirect("plugins.php?deleted=true&plugin_status=$status&paged=$page&s=$s");
</ins><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'clear-recent-list':
</span></span></pre>
</div>
</div>
</body>
</html>