<!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>[17436] branches/3.1: Pink the whites.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17436">17436</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-02-09 17:36:23 +0000 (Wed, 09 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pink the whites.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpadmincsswpadmindevcss">branches/3.1/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#branches31wpadminedittagsphp">branches/3.1/wp-admin/edit-tags.php</a></li>
<li><a href="#branches31wpadminincludesclasswplisttablephp">branches/3.1/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#branches31wpadminincludesclasswpplugininstalllisttablephp">branches/3.1/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#branches31wpadminincludesclasswpthemeslisttablephp">branches/3.1/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#branches31wpadminjseditcommentsdevjs">branches/3.1/wp-admin/js/edit-comments.dev.js</a></li>
<li><a href="#branches31wpadminjslisttabledevjs">branches/3.1/wp-admin/js/list-table.dev.js</a></li>
<li><a href="#branches31wpincludesadminbarphp">branches/3.1/wp-includes/admin-bar.php</a></li>
<li><a href="#branches31wpincludesclasspop3php">branches/3.1/wp-includes/class-pop3.php</a></li>
<li><a href="#branches31wpincludesclasswpadminbarphp">branches/3.1/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#branches31wpincludesfunctionsphp">branches/3.1/wp-includes/functions.php</a></li>
<li><a href="#branches31wpincludesjsadminbardevjs">branches/3.1/wp-includes/js/admin-bar.dev.js</a></li>
<li><a href="#branches31wpincludesqueryphp">branches/3.1/wp-includes/query.php</a></li>
<li><a href="#branches31wpincludesuserphp">branches/3.1/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/css/wp-admin.dev.css (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/css/wp-admin.dev.css 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/css/wp-admin.dev.css 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -3575,9 +3575,9 @@
</span><span class="cx"> 16.0 - Themes
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span><span class="cx">
</span><del>-.theme-install-php .tablenav {
- height:auto;
-}
</del><ins>+.theme-install-php .tablenav {
+ height:auto;
+}
</ins><span class="cx">
</span><span class="cx"> table#availablethemes {
</span><span class="cx"> border-spacing: 0;
</span><span class="lines">@@ -3587,10 +3587,10 @@
</span><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-table#availablethemes .no-items td{
- border-width:0;
- padding:5px;
-}
</del><ins>+table#availablethemes .no-items td{
+ border-width:0;
+ padding:5px;
+}
</ins><span class="cx">
</span><span class="cx"> td.available-theme {
</span><span class="cx"> vertical-align: top;
</span></span></pre></div>
<a id="branches31wpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/edit-tags.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/edit-tags.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/edit-tags.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_REQUEST['paged'] ) )
</span><span class="cx"> $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> wp_redirect( $location );
</span><span class="cx"> exit;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches31wpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/includes/class-wp-list-table.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/class-wp-list-table.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/includes/class-wp-list-table.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_REQUEST['orderby'] ) )
</span><span class="cx"> echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
</span><del>- if ( ! empty( $_REQUEST['order'] ) )
</del><ins>+ if ( ! empty( $_REQUEST['order'] ) )
</ins><span class="cx"> echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
</span><span class="cx"> ?>
</span><span class="cx"> <p class="search-box">
</span><span class="lines">@@ -482,7 +482,7 @@
</span><span class="cx"> $current = $this->get_pagenum();
</span><span class="cx">
</span><span class="cx"> $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_url = remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url );
</span><span class="cx">
</span><span class="cx"> $page_links = array();
</span></span></pre></div>
<a id="branches31wpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/includes/class-wp-plugin-install-list-table.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/class-wp-plugin-install-list-table.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/includes/class-wp-plugin-install-list-table.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> 'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
</span><span class="cx"> 'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> list( $columns, $hidden ) = $this->get_column_info();
</span><span class="cx">
</span><span class="cx"> $style = array();
</span></span></pre></div>
<a id="branches31wpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/includes/class-wp-themes-list-table.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/class-wp-themes-list-table.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/includes/class-wp-themes-list-table.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> _e( 'No items found.' );
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
</span><span class="cx"> printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
</span><span class="lines">@@ -88,23 +88,23 @@
</span><span class="cx"> // Fallthrough.
</span><span class="cx"> printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
</span><span class="cx"> }
</span><del>-
- function tablenav( $which = 'top' ) {
</del><ins>+
+ function tablenav( $which = 'top' ) {
</ins><span class="cx"> if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
</span><span class="cx"> return;
</span><del>- ?>
- <div class="tablenav <?php echo $which; ?>">
- <?php $this->pagination( $which ); ?>
- <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
- <br class="clear" />
- </div>
- <?php
</del><ins>+ ?>
+ <div class="tablenav <?php echo $which; ?>">
+ <?php $this->pagination( $which ); ?>
+ <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
+ <br class="clear" />
+ </div>
+ <?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function display() {
</span><span class="cx"> // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
</span><span class="cx"> ?>
</span><del>- <?php $this->tablenav( 'top' ); ?>
</del><ins>+ <?php $this->tablenav( 'top' ); ?>
</ins><span class="cx">
</span><span class="cx"> <table id="availablethemes" cellspacing="0" cellpadding="0">
</span><span class="cx"> <tbody id="the-list" class="list:themes">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>- <?php $this->tablenav( 'bottom' ); ?>
</del><ins>+ <?php $this->tablenav( 'bottom' ); ?>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branches31wpadminjseditcommentsdevjs"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/js/edit-comments.dev.js (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/js/edit-comments.dev.js 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/js/edit-comments.dev.js 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -218,10 +218,10 @@
</span><span class="cx"> var refillTheExtraList = function(ev) {
</span><span class="cx"> // var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
</span><span class="cx"> var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (! args.paged)
</span><span class="cx"> args.paged = 1;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (args.paged > total_pages) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches31wpadminjslisttabledevjs"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/js/list-table.dev.js (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/js/list-table.dev.js 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-admin/js/list-table.dev.js 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx"> $('select', context).each( function(){
</span><span class="cx"> var options = $('option', this),
</span><span class="cx"> anySelected = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> options.each( function(){
</span><span class="cx"> this.selected = this.defaultSelected;
</span><span class="cx"> anySelected = anySelected || this.defaultSelected;
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // If no options are selected within a single-select dropdown,
</span><span class="cx"> // select the first element by default.
</span><span class="cx"> if ( ! this.multiple && ! anySelected )
</span></span></pre></div>
<a id="branches31wpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/admin-bar.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/admin-bar.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/admin-bar.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -145,9 +145,9 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $short ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> $html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'id' => $id,
</span><span class="cx"> 'title' => __( 'Shortlink' ),
</span></span></pre></div>
<a id="branches31wpincludesclasspop3php"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/class-pop3.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/class-pop3.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/class-pop3.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Licensed under the GNU GPL. For full terms see the file COPYING.
</span><span class="cx"> * @license http://opensource.org/licenses/gpl-license.php GNU General Public License
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * pop3 class
</span><span class="cx"> *
</span><span class="cx"> * $Id$
</span></span></pre></div>
<a id="branches31wpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/class-wp-admin-bar.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/class-wp-admin-bar.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/class-wp-admin-bar.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> function recursive_render( $id, &$menu_item ) { ?>
</span><span class="cx"> <?php
</span><span class="cx"> $is_parent = ! empty( $menu_item['children'] );
</span><del>-
</del><ins>+
</ins><span class="cx"> $menuclass = $is_parent ? 'menupop' : '';
</span><span class="cx"> if ( ! empty( $menu_item['meta']['class'] ) )
</span><span class="cx"> $menuclass .= ' ' . $menu_item['meta']['class'];
</span></span></pre></div>
<a id="branches31wpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/functions.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/functions.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/functions.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -3072,7 +3072,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $list as $key => $obj ) {
</span><span class="cx"> $matched = count( array_intersect_assoc( (array) $obj, $args ) );
</span><del>- if ( ( 'AND' == $operator && $matched == $count )
</del><ins>+ if ( ( 'AND' == $operator && $matched == $count )
</ins><span class="cx"> || ( 'OR' == $operator && $matched <= $count )
</span><span class="cx"> || ( 'NOT' == $operator && 0 == $matched ) ) {
</span><span class="cx"> $filtered[$key] = $obj;
</span></span></pre></div>
<a id="branches31wpincludesjsadminbardevjs"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/js/admin-bar.dev.js (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/js/admin-bar.dev.js 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/js/admin-bar.dev.js 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -53,11 +53,11 @@
</span><span class="cx"> /* remove the hover class for any objects not in the immediate element's ancestry */
</span><span class="cx"> i = q.length;
</span><span class="cx"> while ( i-- ) {
</span><del>- inA = false;
</del><ins>+ inA = false;
</ins><span class="cx"> ancestorLength = ancestors.length;
</span><span class="cx"> while( ancestorLength-- ) {
</span><del>- if ( ancestors[ ancestorLength ] == q[i][1] )
- inA = true;
</del><ins>+ if ( ancestors[ ancestorLength ] == q[i][1] )
+ inA = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! inA )
</span></span></pre></div>
<a id="branches31wpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/query.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/query.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/query.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -1719,7 +1719,7 @@
</span><span class="cx"> 'taxonomy' => 'category',
</span><span class="cx"> 'terms' => $q['category__not_in'],
</span><span class="cx"> 'operator' => 'NOT IN',
</span><del>- 'include_children' => false
</del><ins>+ 'include_children' => false
</ins><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branches31wpincludesuserphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/user.php (17435 => 17436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/user.php 2011-02-09 17:35:36 UTC (rev 17435)
+++ branches/3.1/wp-includes/user.php 2011-02-09 17:36:23 UTC (rev 17436)
</span><span class="lines">@@ -542,13 +542,13 @@
</span><span class="cx"> */
</span><span class="cx"> function query() {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) {
</span><span class="cx"> $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
</span><span class="cx"> } else {
</span><span class="cx"> $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit");
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $this->query_vars['count_total'] )
</span><span class="cx"> $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>