From 96a6f0ac1f7c830a8c8de2d1f378530ca34206f7 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Mon, 17 Aug 2015 21:39:25 +0000
Subject: [PATCH] Pinking shears. Built from
 https://develop.svn.wordpress.org/trunk@33627

git-svn-id: http://core.svn.wordpress.org/trunk@33594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-ajax.php        |  2 +-
 wp-admin/edit-form-comment.php |  2 +-
 wp-admin/includes/upgrade.php  |  4 ++--
 wp-includes/load.php           |  2 +-
 wp-includes/shortcodes.php     | 20 ++++++++++----------
 wp-includes/version.php        |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 15acd7cedb..225272acbe 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -56,7 +56,7 @@ $core_actions_post = array(
 	'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
 	'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
 	'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
-	'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 
+	'save-widget', 'set-post-thumbnail', 'date_format', 'time_format',
 	'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
 	'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
 	'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 6c85f77b94..9b8062da12 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -131,7 +131,7 @@ if ( $comment->comment_parent ) :
 </div>
 <?php endif; ?>
 
-<?php 
+<?php
 	/**
 	 * Filter miscellaneous actions for the edit comment form sidebar.
 	 *
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index cb4d63da31..86d8cf91dd 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1521,7 +1521,7 @@ function upgrade_430() {
 				$tables = array_diff_assoc( $tables, $global_tables );
 			}
 		}
-	
+
 		foreach ( $tables as $table ) {
 			maybe_convert_table_to_utf8mb4( $table );
 		}
@@ -2622,7 +2622,7 @@ endif;
 
 /**
  * Determine if global tables should be upgraded.
- * 
+ *
  * This function performs a series of checks to ensure the environment allows
  * for the safe upgrading of global WordPress database tables. It is necessary
  * because global tables will commonly grow to millions of rows on large
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 330f0eeede..a6ad0222a2 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -764,7 +764,7 @@ function get_current_blog_id() {
  *
  * @global string    $text_direction
  * @global WP_Locale $wp_locale      The WordPress date and time locale object.
- * 
+ *
  * @staticvar bool $loaded
  */
 function wp_load_translations_early() {
diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index a34f530620..c63958b12f 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -208,10 +208,10 @@ function do_shortcode( $content, $ignore_html = false ) {
 
 	$pattern = get_shortcode_regex();
 	$content = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content );
-	
+
 	// Always restore square braces so we don't break things like <!--[if IE ]>
 	$content = unescape_invalid_shortcodes( $content );
-	
+
 	return $content;
 }
 
@@ -331,7 +331,7 @@ function do_shortcodes_in_html_tags( $content, $ignore_html ) {
 	$trans = array( '&#91;' => '&#091;', '&#93;' => '&#093;' );
 	$content = strtr( $content, $trans );
 	$trans = array( '[' => '&#91;', ']' => '&#93;' );
-	
+
 	$pattern = get_shortcode_regex();
 	$textarr = wp_html_split( $content );
 
@@ -368,14 +368,14 @@ function do_shortcodes_in_html_tags( $content, $ignore_html ) {
 			$element = strtr( $element, $trans );
 			continue;
 		}
-		
+
 		// Get element name
 		$front = array_shift( $attributes );
 		$back = array_pop( $attributes );
 		$matches = array();
 		preg_match('%[a-zA-Z0-9]+%', $front, $matches);
 		$elname = $matches[0];
-		
+
 		// Look for shortcodes in each attribute separately.
 		foreach ( $attributes as &$attr ) {
 			$open = strpos( $attr, '[' );
@@ -407,13 +407,13 @@ function do_shortcodes_in_html_tags( $content, $ignore_html ) {
 			}
 		}
 		$element = $front . implode( '', $attributes ) . $back;
-		
+
 		// Now encode any remaining [ or ] chars.
 		$element = strtr( $element, $trans );
 	}
-	
+
 	$content = implode( '', $textarr );
-	
+
 	return $content;
 }
 
@@ -429,7 +429,7 @@ function unescape_invalid_shortcodes( $content ) {
         // Clean up entire string, avoids re-parsing HTML.
         $trans = array( '&#91;' => '[', '&#93;' => ']' );
         $content = strtr( $content, $trans );
-        
+
         return $content;
 }
 
@@ -539,7 +539,7 @@ function strip_shortcodes( $content ) {
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
 	$content = unescape_invalid_shortcodes( $content );
-	
+
 	return $content;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index abb50a9ad9..1fe3da7e27 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-RC2-33626';
+$wp_version = '4.3-RC2-33627';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.