From f63ccddadbdad290e1cd5655dbb5f2e1b6cd04e2 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 9 Feb 2011 17:35:36 +0000 Subject: [PATCH] Pink the whites. git-svn-id: http://svn.automattic.com/wordpress/trunk@17435 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/wp-admin.dev.css | 14 +++++------ wp-admin/edit-tags.php | 2 +- wp-admin/includes/class-wp-list-table.php | 4 ++-- .../class-wp-plugin-install-list-table.php | 2 +- .../includes/class-wp-themes-list-table.php | 24 +++++++++---------- wp-admin/js/edit-comments.dev.js | 4 ++-- wp-admin/js/list-table.dev.js | 4 ++-- wp-includes/admin-bar.php | 4 ++-- wp-includes/class-pop3.php | 2 +- wp-includes/class-wp-admin-bar.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/js/admin-bar.dev.js | 6 ++--- wp-includes/query.php | 2 +- wp-includes/user.php | 4 ++-- 14 files changed, 38 insertions(+), 38 deletions(-) diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css index 8506810398..fbb7564642 100644 --- a/wp-admin/css/wp-admin.dev.css +++ b/wp-admin/css/wp-admin.dev.css @@ -3575,9 +3575,9 @@ span.imgedit-scale-warn { 16.0 - Themes ------------------------------------------------------------------------------*/ -.theme-install-php .tablenav { - height:auto; -} +.theme-install-php .tablenav { + height:auto; +} table#availablethemes { border-spacing: 0; @@ -3587,10 +3587,10 @@ table#availablethemes { width: 100%; } -table#availablethemes .no-items td{ - border-width:0; - padding:5px; -} +table#availablethemes .no-items td{ + border-width:0; + padding:5px; +} td.available-theme { vertical-align: top; diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 5db9aaf29c..0a82e29f3c 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -154,7 +154,7 @@ if ( ! empty($_REQUEST['_wp_http_referer']) ) { if ( ! empty( $_REQUEST['paged'] ) ) $location = add_query_arg( 'paged', (int) $_REQUEST['paged'] ); - + wp_redirect( $location ); exit; } diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index bd5c546bf9..dc20adb0aa 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -198,7 +198,7 @@ class WP_List_Table { if ( ! empty( $_REQUEST['orderby'] ) ) echo ''; - if ( ! empty( $_REQUEST['order'] ) ) + if ( ! empty( $_REQUEST['order'] ) ) echo ''; ?>
- pagination( $which ); ?> - -
-
- +
+ pagination( $which ); ?> + +
+
+ - tablenav( 'top' ); ?> + tablenav( 'top' ); ?> @@ -112,7 +112,7 @@ class WP_Themes_List_Table extends WP_List_Table {
- tablenav( 'bottom' ); ?> + tablenav( 'bottom' ); ?> total_pages) { return; } diff --git a/wp-admin/js/list-table.dev.js b/wp-admin/js/list-table.dev.js index 32e9806940..134005ddee 100644 --- a/wp-admin/js/list-table.dev.js +++ b/wp-admin/js/list-table.dev.js @@ -29,12 +29,12 @@ window.listTable = { $('select', context).each( function(){ var options = $('option', this), anySelected = false; - + options.each( function(){ this.selected = this.defaultSelected; anySelected = anySelected || this.defaultSelected; }); - + // If no options are selected within a single-select dropdown, // select the first element by default. if ( ! this.multiple && ! anySelected ) diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 2123f80ac1..a3f84ad52b 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -145,9 +145,9 @@ function wp_admin_bar_shortlink_menu() { if ( empty( $short ) ) return; - + $html = ''; - + $wp_admin_bar->add_menu( array( 'id' => $id, 'title' => __( 'Shortlink' ), diff --git a/wp-includes/class-pop3.php b/wp-includes/class-pop3.php index e5bd5d7912..fd42b3cb12 100644 --- a/wp-includes/class-pop3.php +++ b/wp-includes/class-pop3.php @@ -12,7 +12,7 @@ * * Licensed under the GNU GPL. For full terms see the file COPYING. * @license http://opensource.org/licenses/gpl-license.php GNU General Public License - * + * * pop3 class * * $Id$ diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php index a2a3cbbf7d..549d5ecf28 100644 --- a/wp-includes/class-wp-admin-bar.php +++ b/wp-includes/class-wp-admin-bar.php @@ -115,7 +115,7 @@ class WP_Admin_Bar { function recursive_render( $id, &$menu_item ) { ?> $obj ) { $matched = count( array_intersect_assoc( (array) $obj, $args ) ); - if ( ( 'AND' == $operator && $matched == $count ) + if ( ( 'AND' == $operator && $matched == $count ) || ( 'OR' == $operator && $matched <= $count ) || ( 'NOT' == $operator && 0 == $matched ) ) { $filtered[$key] = $obj; diff --git a/wp-includes/js/admin-bar.dev.js b/wp-includes/js/admin-bar.dev.js index 7ff75d4388..cf13ca7271 100644 --- a/wp-includes/js/admin-bar.dev.js +++ b/wp-includes/js/admin-bar.dev.js @@ -53,11 +53,11 @@ /* remove the hover class for any objects not in the immediate element's ancestry */ i = q.length; while ( i-- ) { - inA = false; + inA = false; ancestorLength = ancestors.length; while( ancestorLength-- ) { - if ( ancestors[ ancestorLength ] == q[i][1] ) - inA = true; + if ( ancestors[ ancestorLength ] == q[i][1] ) + inA = true; } if ( ! inA ) diff --git a/wp-includes/query.php b/wp-includes/query.php index d97ce752a4..481dabc696 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -1719,7 +1719,7 @@ class WP_Query { 'taxonomy' => 'category', 'terms' => $q['category__not_in'], 'operator' => 'NOT IN', - 'include_children' => false + 'include_children' => false ); } diff --git a/wp-includes/user.php b/wp-includes/user.php index 2a1a101360..cd4b01d9ce 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -542,13 +542,13 @@ class WP_User_Query { */ function query() { global $wpdb; - + if ( is_array( $this->query_vars['fields'] ) || 'all' == $this->query_vars['fields'] ) { $this->results = $wpdb->get_results("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"); } else { $this->results = $wpdb->get_col("SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit"); } - + if ( $this->query_vars['count_total'] ) $this->total_users = $wpdb->get_var("SELECT COUNT(*) $this->query_from $this->query_where");