Remove trailing whitespace

git-svn-id: http://svn.automattic.com/wordpress/trunk@11930 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/canonical.php

@@ -95,8 +95,8 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 				$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
 			}
 		} elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) ) 
-				$redirect['query'] = remove_query_arg('name', $redirect['query']); 
+			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
+				$redirect['query'] = remove_query_arg('name', $redirect['query']);
 		} elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
 			if ( $redirect_url = get_permalink(get_query_var('page_id')) )
 				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);

wp-includes/class-json.php

@@ -266,7 +266,7 @@ class Services_JSON
 	*/
 	function _encode($var)
 	{
-		
+
 		switch (gettype($var)) {
 			case 'boolean':
 				return $var ? 'true' : 'false';

wp-includes/classes.php

@@ -214,7 +214,7 @@ class WP {
 
 					// Trim the query of everything up to the '?'.
 					$query = preg_replace("!^.+\?!", '', $query);
-										
+
 					// Substitute the substring matches into the query.
 					$query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
 
@@ -1594,59 +1594,59 @@ class WP_Ajax_Response {
 
 /**
  * Helper class to remove the need to use eval to replace $matches[] in query strings.
- * 
+ *
  * @since 2.9.0
  */
 class WP_MatchesMapRegex {
 	/**
 	 * store for matches
-	 * 
+	 *
 	 * @access private
 	 * @var array
 	 */
 	var $_matches;
-	
+
 	/**
 	 * store for mapping result
-	 * 
+	 *
 	 * @access public
 	 * @var string
 	 */
 	var $output;
-	
+
 	/**
 	 * subject to perform mapping on (query string containing $matches[] references
-	 * 
+	 *
 	 * @access private
 	 * @var string
 	 */
 	var $_subject;
-	
+
 	/**
-	 * regexp pattern to match $matches[] references 
-	 * 
+	 * regexp pattern to match $matches[] references
+	 *
 	 * @var string
 	 */
 	var $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
-	
+
 	/**
 	 * constructor
-	 * 
+	 *
 	 * @param string $subject subject if regex
 	 * @param array  $matches data to use in map
 	 * @return self
-	 */						
+	 */
 	function WP_MatchesMapRegex($subject, $matches) {
 		$this->_subject = $subject;
 		$this->_matches = $matches;
-		$this->output = $this->_map();				
+		$this->output = $this->_map();
 	}
-	
+
 	/**
 	 * Substitute substring matches in subject.
-	 * 
+	 *
 	 * static helper function to ease use
-	 * 
+	 *
 	 * @access public
 	 * @param string $subject subject
 	 * @param array  $matches data used for subsitution
@@ -1654,12 +1654,12 @@ class WP_MatchesMapRegex {
 	 */
 	function apply($subject, $matches) {
 		$oSelf =& new WP_MatchesMapRegex($subject, $matches);
-		return $oSelf->output;																
+		return $oSelf->output;
 	}
-	
+
 	/**
-	 * do the actual mapping 
-	 * 
+	 * do the actual mapping
+	 *
 	 * @access private
 	 * @return string
 	 */
@@ -1667,10 +1667,10 @@ class WP_MatchesMapRegex {
 		$callback = array(&$this, 'callback');
 		return preg_replace_callback($this->_pattern, $callback, $this->_subject);
 	}
-	
+
 	/**
 	 * preg_replace_callback hook
-	 * 
+	 *
 	 * @access public
 	 * @param  array $matches preg_replace regexp matches
 	 * @return string
@@ -1679,7 +1679,7 @@ class WP_MatchesMapRegex {
 		$index = intval(substr($matches[0], 9, -1));
 		return ( isset( $this->_matches[$index] ) ? $this->_matches[$index] : '' );
 	}
-	
+
 }
 
 ?>

wp-includes/comment-template.php

@@ -835,12 +835,12 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 
 	/**
 	 * The email address of the current comment author escaped for use in attributes.
-	 */	
+	 */
 	$comment_author_email = $commenter['comment_author_email'];  // Escaped by sanitize_comment_cookies()
 
 	/**
 	 * The url of the current comment author escaped for use in attributes.
-	 */	
+	 */
 	$comment_author_url = esc_url($commenter['comment_author_url']);
 
 	/** @todo Use API instead of SELECTs. */

wp-includes/comment.php

@@ -734,9 +734,9 @@ function wp_delete_comment($comment_id) {
 
 	if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
 		return wp_trash_comment($comment_id);
-	
+
 	do_action('delete_comment', $comment_id);
-	
+
 	$trash_meta = get_option('wp_trash_meta');
 	if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) {
 		unset($trash_meta['comments'][$comment_id]);
@@ -1093,7 +1093,7 @@ function wp_new_comment( $commentdata ) {
  */
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
 	global $wpdb;
-		
+
 	$status = '0';
 	switch ( $comment_status ) {
 		case 'hold':

wp-includes/formatting.php

@@ -32,12 +32,12 @@ function wptexturize($text) {
 	$curl = '';
 	$textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
 	$stop = count($textarr);
-	
+
 	/* translators: opening curly quote */
 	$opening_quote = _x('&#8220;', 'opening curly quote');
 	/* translators: closing curly quote */
 	$closing_quote = _x('&#8221;', 'closing curly quote');
-	
+
 	$no_texturize_tags = apply_filters('no_texturize_tags', array('pre', 'code', 'kbd', 'style', 'script', 'tt'));
 	$no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', array('code'));
 	$no_texturize_tags_stack = array();
@@ -1326,7 +1326,7 @@ function translate_smiley($smiley) {
 	$smiley = trim(reset($smiley));
 	$img = $wpsmiliestrans[$smiley];
 	$smiley_masked = esc_attr($smiley);
-	
+
 	$srcurl = apply_filters('smilies_src', "$siteurl/wp-includes/images/smilies/$img", $img, $siteurl);
 
 	return " <img src='$srcurl' alt='$smiley_masked' class='wp-smiley' /> ";
@@ -2087,14 +2087,14 @@ function clean_url( $url, $protocols = null, $context = 'display' ) {
 
 /**
  * Perform a deep string replace operation to ensure the values in $search are no longer present
- * 
+ *
  * Repeats the replacement operation until it no longer replaces anything so as to remove "nested" values
  * e.g. $subject = '%0%0%0DDD', $search ='%0D', $result ='' rather than the '%0%0DD' that
  * str_replace would return
- * 
+ *
  * @since 2.8.1
  * @access private
- * 
+ *
  * @param string|array $search
  * @param string $subject
  * @return string The processed string
@@ -2110,7 +2110,7 @@ function _deep_replace($search, $subject){
 			}
 		}
 	}
-	
+
 	return $subject;
 }
 

wp-includes/functions.php

@@ -3308,13 +3308,13 @@ function wp_timezone_choice( $selected_zone ) {
 			$display = $zone['t_continent'];
 		} else {
 			// It's inside a continent group
-			
+
 			// Continent optgroup
 			if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
 				$label = ( 'Etc' === $zone['continent'] ) ? __( 'Manual offsets' ) : $zone['t_continent'];
 				$structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
 			}
-			
+
 			// Add the city to the value
 			$value[] = $zone['city'];
 			if ( 'Etc' === $zone['continent'] ) {
@@ -3342,7 +3342,7 @@ function wp_timezone_choice( $selected_zone ) {
 			$selected = 'selected="selected" ';
 		}
 		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
-		
+
 		// Close continent optgroup
 		if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
 			$structure[] = '</optgroup>';
@@ -3364,7 +3364,7 @@ function _cleanup_header_comment($str) {
 
 /**
  * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS.
- * 
+ *
  * @since 2.9.0
  *
  * @return void
@@ -3373,15 +3373,15 @@ function wp_scheduled_delete() {
 	global $wpdb;
 
 	$delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
-	
+
 	$posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
-	
+
 	foreach ( (array) $posts_to_delete as $post ) {
 		wp_delete_post($post['post_id']);
 	}
 
 	//Trashed Comments
-	//TODO Come up with a better store for the comment trash meta. 
+	//TODO Come up with a better store for the comment trash meta.
 	$trash_meta = get_option('wp_trash_meta');
 	if ( !is_array($trash_meta) )
 		return;

wp-includes/http.php

@@ -1813,10 +1813,10 @@ class WP_Http_Encoding {
 	/**
 	 * Decompression of deflated string while staying compatible with the majority of servers.
 	 *
-	 * Certain Servers will return deflated data with headers which PHP's gziniflate() 
+	 * Certain Servers will return deflated data with headers which PHP's gziniflate()
 	 * function cannot handle out of the box. The following function lifted from
-	 * http://au2.php.net/manual/en/function.gzinflate.php#77336 will attempt to deflate 
-	 * the various return forms used. 
+	 * http://au2.php.net/manual/en/function.gzinflate.php#77336 will attempt to deflate
+	 * the various return forms used.
 	 *
 	 * @since 2.8.1
 	 * @link http://au2.php.net/manual/en/function.gzinflate.php#77336

wp-includes/kses.php

@@ -1176,16 +1176,16 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 		return '';
 
 	$css_array = split( ';', trim( $css ) );
-	$allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float', 
-	'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color', 
+	$allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float',
+	'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
 	'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
-	'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color', 
-	'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top', 
-	'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side', 
-	'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style', 
-	'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom', 
-	'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom', 
-	'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align', 
+	'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
+	'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top',
+	'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side',
+	'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style',
+	'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
+	'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
+	'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
 	'width' ) );
 
 	if ( empty($allowed_attr) )

wp-includes/link-template.php

@@ -1648,10 +1648,10 @@ function paginate_comments_links($args = array()) {
  */
 function get_shortcut_link() {
 	$link = "javascript:
-			var d=document, 
-			w=window, 
-			e=w.getSelection, 
-			k=d.getSelection, 
+			var d=document,
+			w=window,
+			e=w.getSelection,
+			k=d.getSelection,
 			x=d.selection,
 			s=(e?e():(k)?k():(x?x.createRange().text:0)),
 			f='" . admin_url('press-this.php') . "',

wp-includes/media.php

@@ -349,7 +349,7 @@ function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $de
 	$newimage = wp_imagecreatetruecolor( $dst_w, $dst_h );
 
 	imagecopyresampled( $newimage, $image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-	
+
 	// convert from full colors to index colors, like original PNG.
 	if ( IMAGETYPE_PNG == $orig_type && !imageistruecolor( $image ) )
 		imagetruecolortopalette( $newimage, false, imagecolorstotal( $image ) );
@@ -378,7 +378,7 @@ function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $de
 	} else {
 		// all other formats are converted to jpg
 		$destfilename = "{$dir}/{$name}-{$suffix}.jpg";
-		if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) ) 
+		if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
 			return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
 	}
 
@@ -837,7 +837,7 @@ function gd_edit_image_support($mime_type) {
 				return function_exists('imagecreatefrompng');
 			case 'image/gif':
 				return function_exists('imagecreatefromgif');
-		}		
+		}
 	}
 	return false;
 }

wp-includes/pluggable.php

@@ -998,7 +998,7 @@ function wp_notify_postauthor($comment_id, $comment_type='') {
 		$notify_message .= sprintf( __('URL    : %s'), $comment->comment_author_url ) . "\r\n";
 		$notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
 		$notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
-		/* translators: 1: blog name, 2: post title */		
+		/* translators: 1: blog name, 2: post title */
 		$subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
 	} elseif ('pingback' == $comment_type) {
 		/* translators: 1: post id, 2: post title */

wp-includes/post.php

@@ -135,7 +135,7 @@ function &get_children($args = '', $output = OBJECT) {
 	$r = wp_parse_args( $args, $defaults );
 
 	$children = get_posts( $r );
-	
+
 	if ( !$children )
 		return $kids;
 
@@ -583,7 +583,7 @@ function delete_post_meta($post_id, $meta_key, $meta_value = '') {
 		$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $meta_key, $meta_value ) );
 
 	wp_cache_delete($post_id, 'post_meta');
-	
+
 	do_action( 'deleted_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
 
 	return true;
@@ -672,12 +672,12 @@ function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
 	}
 
 	do_action( 'update_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-	
+
 	$wpdb->update( $wpdb->postmeta, $data, $where );
 	wp_cache_delete($post_id, 'post_meta');
-	
+
 	do_action( 'updated_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-	
+
 	return true;
 }
 
@@ -1154,12 +1154,12 @@ function wp_delete_post($postid = 0) {
 
 	if ( ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0 )
 		return wp_trash_post($postid);
-		
+
 	if ( $post->post_type == 'attachment' )
 		return wp_delete_attachment($postid);
 
 	do_action('delete_post', $postid);
-	
+
 	delete_post_meta($postid,'_wp_trash_meta_status');
 	delete_post_meta($postid,'_wp_trash_meta_time');
 
@@ -1819,14 +1819,14 @@ function check_and_publish_future_post($post_id) {
 function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) {
 	if ( in_array( $post_status, array( 'draft', 'pending' ) ) )
 		return $slug;
-	
+
 	global $wpdb, $wp_rewrite;
 	$hierarchical_post_types = apply_filters('hierarchical_post_types', array('page'));
 	if ( 'attachment' == $post_type ) {
 		// Attachment slugs must be unique across all types.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
 		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
-		
+
 		if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
 			$suffix = 2;
 			do {
@@ -1841,7 +1841,7 @@ function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_pa
 		// separate namespace than posts so page slugs are allowed to overlap post slugs.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode("', '", $wpdb->escape($hierarchical_post_types)) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
 		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent));
-		
+
 		if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
 			$suffix = 2;
 			do {
@@ -1855,7 +1855,7 @@ function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_pa
 		// Post slugs must be unique across all posts.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
 		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
-		
+
 		if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
 			$suffix = 2;
 			do {

wp-includes/query.php

@@ -2697,7 +2697,7 @@ function setup_postdata($post) {
 	}
 
 	do_action_ref_array('the_post', array(&$post));
-	
+
 	return true;
 }
 

wp-includes/registration.php

@@ -306,7 +306,7 @@ function wp_create_user($username, $password, $email = '') {
  * Setup the default contact methods
  *
  * @access private
- * @since 
+ * @since
  *
  * @return array $user_contactmethods Array of contact methods and their labels.
  */

wp-includes/script-loader.php

@@ -452,7 +452,7 @@ function wp_default_styles( &$styles ) {
 
 	// Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
 	$styles->add( 'colors', true, array(), $colors_version );
-	
+
 	// do not refer to these directly, the right one is queued by the above "meta" colors handle
 	$styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array(), $colors_version);
 	$styles->add_data( 'colors-fresh', 'rtl', true );

wp-includes/theme.php

@@ -604,13 +604,13 @@ function get_category_template() {
 	$category = get_category( $cat_ID );
 
 	$templates = array();
-	
+
 	if ( !is_wp_error($category) )
 		$templates[] = "category-{$category->slug}.php";
 
 	$templates[] = "category-$cat_ID.php";
-	$templates[] = "category.php";	
-	
+	$templates[] = "category.php";
+
 	$template = locate_template($templates);
 	return apply_filters('category_template', $template);
 }

wp-includes/user.php

@@ -420,7 +420,7 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
 
 	wp_cache_delete($user_id, 'users');
 
-	if ( !$cur ) 
+	if ( !$cur )
 		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
 	else
 		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );

wp-includes/wp-db.php

@@ -263,7 +263,7 @@ class wpdb {
 	 */
 	var $old_tables = array('categories', 'post2cat', 'link2cat');
 
-	
+
 	/**
 	 * Format specifiers for DB columns. Columns not listed here default to %s.  Initialized in wp-settings.php.
 	 *