From ff98cfcf450bdf3a5f7465010ccb15d615281cfb Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 8 Jan 2015 05:03:23 +0000
Subject: [PATCH] Pinking Shears.

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31077


git-svn-id: http://core.svn.wordpress.org/trunk@31058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/file.php                 | 2 +-
 wp-admin/includes/meta-boxes.php           | 2 +-
 wp-admin/theme-install.php                 | 2 +-
 wp-includes/class-wp-customize-manager.php | 2 +-
 wp-includes/locale.php                     | 2 +-
 wp-includes/version.php                    | 2 +-
 wp-includes/widgets.php                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 156437fac6..6b3facac5f 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -925,7 +925,7 @@ function get_filesystem_method( $args = array(), $context = false, $allow_relaxe
 			}
 
 			if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
-				// WordPress is creating files as the same owner as the WordPress files, 
+				// WordPress is creating files as the same owner as the WordPress files,
 				// this means it's safe to modify & create new files via PHP.
 				$method = 'direct';
 				$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index c7307d5204..6b1f3b18ab 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -755,7 +755,7 @@ function page_attributes_meta_box($post) {
  *                        include 'meta-box' or 'quick-edit'.
  */
 $default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'meta-box' );
-?> 
+?>
 <option value="default"><?php echo esc_html( $default_title ); ?></option>
 <?php page_template_dropdown($template); ?>
 </select>
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 202557f73f..d42091d676 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -245,7 +245,7 @@ if ( $tab ) {
 					<# } else { #>
 						<div class="rating">
 							<small class="ratings"><?php _e( 'This theme has not been rated yet.' ); ?></small>
-						</div> 
+						</div>
 					<# } #>
 					<div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div>
 					<div class="theme-description">{{{ data.description }}}</div>
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 43859f1dda..0684e33cb7 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -672,7 +672,7 @@ final class WP_Customize_Manager {
 
 		/**
 		 * Filter response data for a successful customize_save Ajax request.
-		 * 
+		 *
 		 * This filter does not apply if there was a nonce or authentication failure.
 		 *
 		 * @since 4.2.0
diff --git a/wp-includes/locale.php b/wp-includes/locale.php
index 73f282c300..41c396bed2 100644
--- a/wp-includes/locale.php
+++ b/wp-includes/locale.php
@@ -88,7 +88,7 @@ class WP_Locale {
 	 * @var array
 	 */
 	var $number_format;
-	
+
 	/**
 	 * Sets up the translated strings and object properties.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 076293c19d..8ca5005159 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31075';
+$wp_version = '4.2-alpha-31077';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index 2e710ccb89..f6502d45f9 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -166,7 +166,7 @@ class WP_Widget {
 
 	/**
 	 * PHP4 constructor
-	 * 
+	 *
 	 * @param string $id_base
 	 * @param string $name
 	 * @param array  $widget_options