Changeset 16282 for trunk/wp-includes/script-loader.php

Timestamp:

11/10/2010 09:53:30 PM (14 years ago)

Author:

westi

Message:

Move the l10n helper function into a seperate js file so we can always output it first.
Fixes #15124.

File:

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

trunk/wp-includes/script-loader.php

@@ -59 +59 @@
     $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
 
-    $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' );
+    // Always ensure that we have the convertEntities function
+    $scripts->add( 'l10n', "/wp-includes/js/l10n$suffix.js", false, '20101110' );
+    $scripts->enqueue( 'l10n' );
+    
+    $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
 
     $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20101007' );
@@ -623 +627 @@
 
     script_concat_settings();
+    $wp_scripts->do_item( 'l10n' );
     $wp_scripts->do_concat = $concatenate_scripts;
     $wp_scripts->do_head_items();