Cut 'em out, move 'em on, trailing whitespace

git-svn-id: https://develop.svn.wordpress.org/trunk@15116 602fd350-edb4-49c9-b593-d223f7449a82

wp-includes/feed.php

@@ -191,7 +191,7 @@ function the_permalink_rss() {
 
 /**
  * Outputs the link to the comments for the current post in an xml safe way
- * 
+ *
  * @since 3.0.0
  * @return none
  */

wp-includes/functions.php

@@ -2306,7 +2306,7 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
 	clearstatcache();
-	
+
 	// Set correct file permissions
 	$stat = @ stat( dirname( $new_file ) );
 	$perms = $stat['mode'] & 0007777;

wp-includes/l10n.php

@@ -366,7 +366,7 @@ function load_default_textdomain() {
 	$locale = get_locale();
 
 	load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
-	
+
 	if ( is_multisite() || ( defined( 'WP_NETWORK_ADMIN_PAGE' ) && WP_NETWORK_ADMIN_PAGE ) ) {
 		load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
 	}

wp-includes/nav-menu-template.php

@@ -314,9 +314,9 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 				$active_object = $menu_item->object;
 			}
 		}
-		
+
 		// back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
-		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id ) 
+		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
 			$classes[] = 'current_page_parent';
 
 		$menu_items[$key]->classes = array_unique( $classes );
@@ -343,7 +343,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			$classes[] = 'current-menu-parent';
 		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
 			$classes[] = 'current-' . $active_object . '-parent';
-		
+
 		if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
 			// Back compat classes for pages to match wp_page_menu()
 			if ( in_array('current-menu-parent', $classes) )
@@ -351,7 +351,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			if ( in_array('current-menu-ancestor', $classes) )
 				$classes[] = 'current_page_ancestor';
 		}
-		
+
 		$menu_items[$key]->classes = array_unique( $classes );
 	}
 }

wp-includes/nav-menu.php

@@ -284,7 +284,7 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 	);
 
 	$args = wp_parse_args( $menu_item_data, $defaults );
-	
+
 	if ( 0 == $menu_id ) {
 		$args['menu-item-position'] = 1;
 	} elseif ( 0 == (int) $args['menu-item-position'] ) {
@@ -367,13 +367,13 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 	update_post_meta( $menu_item_db_id, '_menu_item_object_id', (int) $args['menu-item-object-id'] );
 	update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
 	update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
-	
+
 	$args['menu-item-classes'] = array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-classes'] ) );
 	$args['menu-item-xfn'] = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
 	update_post_meta( $menu_item_db_id, '_menu_item_classes', $args['menu-item-classes'] );
 	update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
 	update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
-	
+
 	if ( 0 == $menu_id )
 		update_post_meta( $menu_item_db_id, '_menu_item_orphaned', time() );
 	else

wp-includes/post-template.php

@@ -127,7 +127,7 @@ function get_the_title( $id = 0 ) {
  * The guid will appear to be a link, but should not be used as an link to the
  * post. The reason you should not use it as a link, is because of moving the
  * blog across domains.
- * 
+ *
  * Url is escaped to make it xml safe
  *
  * @since 1.5.0

wp-includes/taxonomy.php

@@ -2395,7 +2395,7 @@ function _pad_term_counts(&$terms, $taxonomy) {
 	// Get the object and term ids and stick them in a lookup table
 	$tax_obj = get_taxonomy($taxonomy);
 	$object_types = esc_sql($tax_obj->object_type);
-	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'"); 
+	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
 	foreach ( $results as $row ) {
 		$id = $term_ids[$row->term_taxonomy_id];
 		$term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;