<!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>[15527] trunk/wp-admin: On the plugins page, set and at the right time.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15527">15527</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-24 19:50:55 +0000 (Tue, 24 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>On the plugins page, set and at the right time. See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></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 (15526 => 15527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-23 21:44:25 UTC (rev 15526)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-24 19:50:55 UTC (rev 15527)
</span><span class="lines">@@ -3061,6 +3061,19 @@
</span><span class="cx"> class WP_Plugins_Table extends WP_List_Table {
</span><span class="cx">
</span><span class="cx"> function WP_Plugins_Table() {
</span><ins>+ global $status, $page;
+
+ $default_status = get_user_option( 'plugins_last_view' );
+ if ( empty( $default_status ) )
+ $default_status = 'all';
+ $status = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : $default_status;
+ if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
+ $status = 'all';
+ if ( $status != $default_status && 'search' != $status )
+ update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
+
+ $page = $this->get_pagenum();
+
</ins><span class="cx"> parent::WP_List_Table( array(
</span><span class="cx"> 'screen' => 'plugins',
</span><span class="cx"> 'plural' => 'plugins',
</span><span class="lines">@@ -3086,8 +3099,6 @@
</span><span class="cx">
</span><span class="cx"> wp_reset_vars( array( 'orderby', 'order', 's' ) );
</span><span class="cx">
</span><del>- $page = $this->get_pagenum();
-
</del><span class="cx"> $plugins = array(
</span><span class="cx"> 'all' => apply_filters( 'all_plugins', get_plugins() ),
</span><span class="cx"> 'search' => array(),
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (15526 => 15527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-08-23 21:44:25 UTC (rev 15526)
+++ trunk/wp-admin/plugins.php 2010-08-24 19:50:55 UTC (rev 15527)
</span><span class="lines">@@ -293,15 +293,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$default_status = get_user_option( 'plugins_last_view' );
-if ( empty( $default_status ) )
- $default_status = 'all';
-$status = isset( $_REQUEST['plugin_status'] ) ? $_REQUEST['plugin_status'] : $default_status;
-if ( !in_array( $status, array( 'all', 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
- $status = 'all';
-if ( $status != $default_status && 'search' != $status )
- update_user_meta( get_current_user_id(), 'plugins_last_view', $status );
-
</del><span class="cx"> $wp_list_table->prepare_items();
</span><span class="cx">
</span><span class="cx"> wp_enqueue_script('plugin-install');
</span></span></pre>
</div>
</div>
</body>
</html>