From 44fb83dc0bc11456346381586c6da38f623e2fac Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 29 Oct 2015 10:32:26 +0000
Subject: [PATCH] Shortcodes: Tweak the error messages added in [34745].

See #34090.


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


git-svn-id: http://core.svn.wordpress.org/trunk@35392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/shortcodes.php | 4 ++--
 wp-includes/version.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 057fad73be..2d15fb584c 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -90,13 +90,13 @@ function add_shortcode($tag, $func) {
 	global $shortcode_tags;
 
 	if ( '' == trim( $tag ) ) {
-		$message = __( 'Invalid shortcode name.  Empty name given.' );
+		$message = __( 'Invalid shortcode name: Empty name given.' );
 		_doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
 		return;
 	}
 
 	if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20]@', $tag ) ) {
-		$message = sprintf( __( 'Invalid shortcode name: %s  Do not use spaces or reserved chars: & / < > [ ]' ), $tag );
+		$message = sprintf( __( 'Invalid shortcode name: %s. Do not use spaces or reserved characters: & / < > [ ]' ), $tag );
 		_doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
 		return;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c337a56daf..15c95917c5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35427';
+$wp_version = '4.4-beta2-35428';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.