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

Fixes #15124.

git-svn-id: https://develop.svn.wordpress.org/trunk@16282 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Peter Westwood
2010-11-10 21:53:30 +00:00
parent e6d62aeb48
commit 6b1be702c4
6 changed files with 34 additions and 24 deletions

View File

@@ -58,7 +58,11 @@ function wp_default_scripts( &$scripts ) {
$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' );
$scripts->add_data( 'common', 'group', 1 );
@@ -622,6 +626,7 @@ function print_head_scripts() {
$wp_scripts = new WP_Scripts();
script_concat_settings();
$wp_scripts->do_item( 'l10n' );
$wp_scripts->do_concat = $concatenate_scripts;
$wp_scripts->do_head_items();