From d910c26182fffdb1cabcd97e807c4f5b5f596796 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 27 Feb 2012 19:46:52 +0000
Subject: [PATCH] Pinking shears 6-20000

git-svn-id: http://svn.automattic.com/wordpress/trunk@20000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/js/theme.dev.js                   |  2 +-
 wp-admin/js/utils.dev.js                   | 10 +++++-----
 wp-app.php                                 |  4 ++--
 wp-includes/class-wp-customize-setting.php |  4 ++--
 wp-includes/class-wp-xmlrpc-server.php     |  8 ++++----
 wp-includes/class.wp-scripts.php           |  2 +-
 wp-includes/comment.php                    | 14 +++++++-------
 wp-includes/deprecated.php                 |  2 +-
 wp-includes/functions.php                  |  2 +-
 wp-includes/link-template.php              |  4 ++--
 wp-includes/rewrite.php                    |  2 +-
 wp-includes/update.php                     |  4 ++--
 12 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/wp-admin/js/theme.dev.js b/wp-admin/js/theme.dev.js
index 5e1ab3e0e..98b44583a 100644
--- a/wp-admin/js/theme.dev.js
+++ b/wp-admin/js/theme.dev.js
@@ -106,7 +106,7 @@ var ThemeScroller;
 
 			if ( $('.tablenav-pages').length )
 				this.pollInterval =
-					setInterval( function() { 
+					setInterval( function() {
 						return self.poll();
 					}, this.scrollPollingDelay );
 		},
diff --git a/wp-admin/js/utils.dev.js b/wp-admin/js/utils.dev.js
index dbdf6c9e2..d7566362a 100644
--- a/wp-admin/js/utils.dev.js
+++ b/wp-admin/js/utils.dev.js
@@ -31,7 +31,7 @@ var wpCookies = {
 	/**
 	 * Get a multi-values cookie.
 	 * Returns a JS object with the name: 'value' pairs.
-	 */	 	 	
+	 */
 	getHash : function(name) {
 		var all = this.get(name), ret;
 
@@ -49,7 +49,7 @@ var wpCookies = {
 	 * Set a multi-values cookie.
 	 *
 	 * 'values_obj' is the JS object that is stored. It is encoded as URI in wpCookies.set().
-	 */	 	 	
+	 */
 	setHash : function(name, values_obj, expires, path, domain, secure) {
 		var str = '';
 
@@ -62,7 +62,7 @@ var wpCookies = {
 
 	/**
 	 * Get a cookie.
-	 */	 	
+	 */
 	get : function(name) {
 		var cookie = document.cookie, e, p = name + "=", b;
 
@@ -94,7 +94,7 @@ var wpCookies = {
 	 *
 	 * The 'expires' arg can be either a JS Date() object set to the expiration date (back-compat)
 	 * or the number of seconds until expiration
-	 */	 	
+	 */
 	set : function(name, value, expires, path, domain, secure) {
 		var d = new Date();
 
@@ -118,7 +118,7 @@ var wpCookies = {
 	 * Remove a cookie.
 	 *
 	 * This is done by setting it to an empty value and setting the expiration time in the past.
-	 */	 	
+	 */
 	remove : function(name, path) {
 		this.set(name, '', -1000, path);
 	}
diff --git a/wp-app.php b/wp-app.php
index 12bc2ff88..66d1a8e33 100644
--- a/wp-app.php
+++ b/wp-app.php
@@ -410,7 +410,7 @@ EOD;
 		$post_content = '';
 		$post_excerpt = '';
 		$pubtimes     = '';
-		
+
 		if ( isset( $entry->title ) && is_array( $entry->title ) && !empty( $entry->title[1] ) )
 			$post_title = (string) $entry->title[1];
 		if ( isset( $entry->content ) && is_array( $entry->content ) && !empty( $entry->content[1] ) )
@@ -419,7 +419,7 @@ EOD;
 			$post_excerpt = (string) $entry->summary[1];
 		if ( !empty( $entry->published ) )
 			$pubtimes = (string) $entry->published;
-		
+
 		$pubtimes = $this->get_publish_time( $pubtimes );
 
 		$post_date = $pubtimes[0];
diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php
index 2f6880012..c2b0f74e5 100644
--- a/wp-includes/class-wp-customize-setting.php
+++ b/wp-includes/class-wp-customize-setting.php
@@ -6,7 +6,7 @@
  * @subpackage Customize
  * @since 3.4.0
  */
- 
+
 class WP_Customize_Setting {
 	public $id;
 	public $priority          = 10;
@@ -98,7 +98,7 @@ class WP_Customize_Setting {
 	 * Callback function to filter the theme mods and options.
 	 *
 	 * @since 3.4.0
-	 * 
+	 *
 	 * @param mixed Old value.
 	 * @return mixed New or old value.
 	 */
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index a63813dae..6a4ac5d0f 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -637,8 +637,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			return new IXR_Error( 403, __( 'Invalid post type' ) );
 
 		$update = false;
-		if ( ! empty( $post_data[ 'ID' ] ) ) 
-			$update = true; 
+		if ( ! empty( $post_data[ 'ID' ] ) )
+			$update = true;
 
 		if ( $update ) {
 			if ( ! current_user_can( $post_type->cap->edit_post, $post_data[ 'ID' ] ) )
@@ -697,7 +697,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		// Do some timestamp voodoo
 		if ( ! empty( $post_data['post_date_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
-			$dateCreated = str_replace( 'Z', '', $post_data['post_date_gmt']->getIso() ) . 'Z'; 
+			$dateCreated = str_replace( 'Z', '', $post_data['post_date_gmt']->getIso() ) . 'Z';
 		} elseif ( ! empty( $post_data['post_date'] ) ) {
 			$dateCreated = $post_data['post_date']->getIso();
 		}
@@ -3201,7 +3201,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			$menu_order = $content_struct['wp_page_order'];
 
 		if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
-			$page_template = $content_struct['wp_page_template']; 
+			$page_template = $content_struct['wp_page_template'];
 
 		$post_author = $postdata['post_author'];
 
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 039a4e3a1..ff0ca4d5d 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -34,7 +34,7 @@ class WP_Scripts extends WP_Dependencies {
 		if ( ! function_exists( 'did_action' ) || did_action( 'init' ) )
 			$this->init();
 		else
-			add_action( 'init', array( $this, 'init' ), 0 ); 
+			add_action( 'init', array( $this, 'init' ), 0 );
 	}
 
 	function init() {
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index cd51cb74f..5a526305f 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -569,16 +569,16 @@ function update_comment_meta($comment_id, $meta_key, $meta_value, $prev_value =
 	return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
 }
 
-/**  
- * Sets the cookies used to store an unauthenticated commentator's identity. Typically used  
- * to recall previous comments by this commentator that are still held in moderation.  
- *  
+/**
+ * Sets the cookies used to store an unauthenticated commentator's identity. Typically used
+ * to recall previous comments by this commentator that are still held in moderation.
+ *
  * @param object $comment Comment object.
  * @param object $user Comment author's object.
  *
  * @since 3.4.0
- */  
-function wp_set_comment_cookies($comment, $user) {  
+ */
+function wp_set_comment_cookies($comment, $user) {
 	if ( $user->ID )
 		return;
 
@@ -586,7 +586,7 @@ function wp_set_comment_cookies($comment, $user) {
 	setcookie('comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
 	setcookie('comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
 	setcookie('comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN);
-}  
+}
 
 /**
  * Sanitizes the cookies sent to the user already.
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 60cd4cf29..ba1a7ea20 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -2870,7 +2870,7 @@ function is_blog_user( $blog_id = 0 ) {
 }
 
 /**
- * Open the file handle for debugging. 
+ * Open the file handle for debugging.
  *
  * @since 0.71
  * @deprecated Use error_log()
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 16de3cd1e..5541e8051 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -20,7 +20,7 @@ require( ABSPATH . WPINC . '/option.php' );
  *
  * @param string $format Format of the date to return.
  * @param string $date Date string to convert.
- * @param bool $translate Whether the return date should be translated. Default is true. 
+ * @param bool $translate Whether the return date should be translated. Default is true.
  * @return string|int Formatted date string, or Unix timestamp.
  */
 function mysql2date( $format, $date, $translate = true ) {
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 0023f1373..3a04cc480 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -1869,7 +1869,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
 		$url = get_blog_option( $blog_id, 'home' );
 
 	if ( 'relative' == $scheme )
-		$url = preg_replace( '#^.+://[^/]*#', '', $url ); 
+		$url = preg_replace( '#^.+://[^/]*#', '', $url );
 	elseif ( 'http' != $scheme )
 		$url = str_replace( 'http://', "$scheme://", $url );
 
@@ -1934,7 +1934,7 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
 		$url = get_blog_option( $blog_id, 'siteurl' );
 
 	if ( 'relative' == $scheme )
-		$url = preg_replace( '#^.+://[^/]*#', '', $url ); 
+		$url = preg_replace( '#^.+://[^/]*#', '', $url );
 	elseif ( 'http' != $scheme )
 		$url = str_replace( 'http://', "{$scheme}://", $url );
 
diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 5d0d27caf..b805515fb 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -639,7 +639,7 @@ class WP_Rewrite {
 	 * would have a set of rules added to the top of the rewrite rules array.
 	 * Now it tells {@link WP::parse_request()} to check if a URL matching the
 	 * page permastruct is actually a page before accepting it.
-	 * 
+	 *
 	 * @link http://core.trac.wordpress.org/ticket/16687
 	 * @see WP_Rewrite::init()
 	 * @since 2.5.0
diff --git a/wp-includes/update.php b/wp-includes/update.php
index 284448dc7..6cd57843c 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -163,7 +163,7 @@ function wp_update_plugins() {
 		default :
 			$timeout = 43200; // 12 hours
 	}
-	
+
 	$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 
 	if ( $time_not_changed ) {
@@ -275,7 +275,7 @@ function wp_update_themes() {
 		default :
 			$timeout = 43200; // 12 hours
 	}
-	
+
 	$time_not_changed = isset( $last_update->last_checked ) && $timeout > ( time( ) - $last_update->last_checked );
 
 	if ( $time_not_changed ) {