WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gary Pendergast 2015-10-29 10:32:26 +00:00
parent db8b09c40d
commit 44fb83dc0b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/shortcodes.php
View File

@ -90,13 +90,13 @@ function add_shortcode($tag, $func) {
global $shortcode_tags; global $shortcode_tags;
if ( '' == trim( $tag ) ) { 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' ); _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
return; return;
} }
if ( 0 !== preg_match( '@[<>&/\[\]\x00-\x20]@', $tag ) ) { 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' ); _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
return; return;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.