diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index f323e9c0af..d249ede91f 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -2851,9 +2851,11 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) { $original_text = $text; $text = wp_strip_all_tags( $text ); - /* translators: If your word count is based on single characters (e.g. East Asian characters), - enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. - Do not translate into your own language. */ + /* + * translators: If your word count is based on single characters (e.g. East Asian characters), + * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. + * Do not translate into your own language. + */ if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) { $text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' ); preg_match_all( '/./u', $text, $words_array ); diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 67a43d7fea..e3460a22eb 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -401,9 +401,11 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array(), false, 1 ); did_action( 'init' ) && $scripts->localize( 'word-count', 'wordCountL10n', array( - /* translators: If your word count is based on single characters (e.g. East Asian characters), - enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. - Do not translate into your own language. */ + /* + * translators: If your word count is based on single characters (e.g. East Asian characters), + * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'. + * Do not translate into your own language. + */ 'type' => _x( 'words', 'Word count type. Do not translate!' ), 'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array() ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index d416656c6f..16092a8f7e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-RC1-33516'; +$wp_version = '4.3-RC1-33517'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.