From ad4a081c0c0c855a1abeed2a324e829f741503d1 Mon Sep 17 00:00:00 2001
From: Ryan Boren <ryan@boren.nu>
Date: Mon, 20 May 2013 12:10:58 +0000
Subject: [PATCH] Pinking shears

git-svn-id: http://core.svn.wordpress.org/trunk@24303 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/css/ie-rtl.css    |  6 +++---
 wp-admin/includes/misc.php |  2 +-
 wp-admin/js/post.js        |  2 +-
 wp-includes/class-http.php |  8 ++++----
 wp-includes/taxonomy.php   | 16 ++++++++--------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/wp-admin/css/ie-rtl.css b/wp-admin/css/ie-rtl.css
index 50e2e8d416..b947f0b200 100644
--- a/wp-admin/css/ie-rtl.css
+++ b/wp-admin/css/ie-rtl.css
@@ -234,7 +234,7 @@ p.button-controls,
 	right: 0;
 }
 
-.screen-reader-text { 
+.screen-reader-text {
 	right: auto;
-	text-indent: -1000em; 
-} 
\ No newline at end of file
+	text-indent: -1000em;
+}
\ No newline at end of file
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index deb470f9b9..b84e9c7f0b 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -611,7 +611,7 @@ function wp_refresh_post_lock( $response, $data, $screen_id ) {
 			$error = array(
 				'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
 			);
-			
+
 			if ( $avatar = get_avatar( $user->ID, 64 ) ) {
 				if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
 					$error['avatar_src'] = $matches[1];
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index ae7da28bff..68a702467b 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -326,7 +326,7 @@ $(document).on( 'heartbeat-tick.refresh-lock', function( e, data ) {
 		timeout = window.setTimeout( function(){ check = 1; }, 3600000 );
 	}
 
-	$(document).on( 'heartbeat-send.wp-refresh-nonces', function( e, data ) { 
+	$(document).on( 'heartbeat-send.wp-refresh-nonces', function( e, data ) {
 		var nonce, post_id;
 
 		if ( check ) {
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index 7512948ba6..ffb2aebb3c 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -762,12 +762,12 @@ class WP_Http_Fsockopen {
 						$process['body'] = '';
 					}
 				}
-				
+
 				if ( isset( $r['limit-response-size'] ) && ( $bytes_written + strlen( $block ) ) > $r['limit-response-size'] )
 					$block = substr( $block, 0, ( $r['limit-response-size'] - $bytes_written ) );
 
-				$bytes_written += fwrite( $stream_handle, $block );				
-				
+				$bytes_written += fwrite( $stream_handle, $block );
+
 				$keep_reading = !isset( $r['limit-response-size'] ) || $bytes_written < $r['limit-response-size'];
 			}
 
@@ -1847,7 +1847,7 @@ class WP_Http_Encoding {
 
 			if ( function_exists( 'gzuncompress' ) )
 				$type[] = 'compress;q=0.5';
-	
+
 			if ( function_exists( 'gzdecode' ) )
 				$type[] = 'gzip;q=0.5';
 		}
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 84694b50cd..64a38ea3e2 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -2216,12 +2216,12 @@ function wp_set_object_terms($object_id, $terms, $taxonomy, $append = false) {
 
 	if ( ! $append ) {
 		$delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
-		
+
 		if ( $delete_tt_ids ) {
 			$in_delete_tt_ids = "'" . implode( "', '", $delete_tt_ids ) . "'";
 			$delete_term_ids = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
 			$delete_term_ids = array_map( 'intval', $delete_term_ids );
-			
+
 			$remove = wp_remove_object_terms( $object_id, $delete_term_ids, $taxonomy );
 			if ( is_wp_error( $remove ) ) {
 				return $remove;
@@ -2295,33 +2295,33 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
 	}
 
 	$tt_ids = array();
-	
+
 	foreach ( (array) $terms as $term ) {
 		if ( ! strlen( trim( $term ) ) ) {
 			continue;
 		}
-	
+
 		if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
 			// Skip if a non-existent term ID is passed.
 			if ( is_int( $term ) ) {
 				continue;
 			}
 		}
-	
+
 		if ( is_wp_error( $term_info ) ) {
 			return $term_info;
 		}
-	
+
 		$tt_ids[] = $term_info['term_taxonomy_id'];
 	}
-	
+
 	if ( $tt_ids ) {
 		$in_tt_ids = "'" . implode( "', '", $tt_ids ) . "'";
 		do_action( 'delete_term_relationships', $object_id, $tt_ids );
 		$deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
 		do_action( 'deleted_term_relationships', $object_id, $tt_ids );
 		wp_update_term_count( $tt_ids, $taxonomy );
-		
+
 		return (bool) $deleted;
 	}