Changeset 41844

Timestamp:

10/12/2017 05:09:10 AM (7 years ago)

Author:

pento

Message:

Editor: Improve the accuracy of the list of shortcodes that the word count ignores.

Previously, shortcodes were being counted when the init action fired, even though it's possible for shortcodes to be registered later than that.

By leaving the counting until just before the script is printed, we get a more accurate list of shortcodes.

Props ocean90.
Fixes #41917.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/script-loader.php

@@ -529 +529 @@
 
     $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.
-         */
-        'type' => _x( 'words', 'Word count type. Do not translate!' ),
-        'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-    ) );
 
     $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
@@ -1074 +1065 @@
         'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
     ) );
+
+    wp_localize_script( '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.
+         */
+        'type' => _x( 'words', 'Word count type. Do not translate!' ),
+        'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
+    ) );
 }