From fbdbba9e01d58d4adb9e95a41bdead8b86fd6c53 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Tue, 14 Apr 2015 15:12:49 +0000 Subject: [PATCH] Revert [31030] and [31033]. Incidentally, there is no lazy-loading happening here anyway. Pushing #26111 to future. git-svn-id: https://develop.svn.wordpress.org/trunk@32124 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class.wp-scripts.php | 6 +----- src/wp-includes/functions.wp-scripts.php | 9 ++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/wp-includes/class.wp-scripts.php b/src/wp-includes/class.wp-scripts.php index 988ba792b0..b7c7dedad5 100644 --- a/src/wp-includes/class.wp-scripts.php +++ b/src/wp-includes/class.wp-scripts.php @@ -163,7 +163,7 @@ class WP_Scripts extends WP_Dependencies { $tag = "{$cond_before}\n{$cond_after}"; - /** + /** * Filter the HTML script tag of an enqueued script. * * @since 4.1.0 @@ -192,10 +192,6 @@ class WP_Scripts extends WP_Dependencies { if ( $handle === 'jquery' ) $handle = 'jquery-core'; - if ( is_callable( $l10n ) ) { - $l10n = call_user_func( $l10n, $handle, $object_name ); - } - if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present $after = $l10n['l10n_print_after']; unset($l10n['l10n_print_after']); diff --git a/src/wp-includes/functions.wp-scripts.php b/src/wp-includes/functions.wp-scripts.php index 6f59a03fe9..c4be60c48a 100644 --- a/src/wp-includes/functions.wp-scripts.php +++ b/src/wp-includes/functions.wp-scripts.php @@ -138,11 +138,10 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f * * @todo Documentation cleanup * - * @param string $handle Script handle the data will be attached to. - * @param string $object_name Name for the JavaScript object. Passed directly, so it should be qualified JS variable. - * Example: '/[a-zA-Z0-9_]+/'. - * @param array|callable $l10n The data itself. The data can be either a single or multi-dimensional array. If a callable - * is passed, it will be invoked at runtime. + * @param string $handle Script handle the data will be attached to. + * @param string $object_name Name for the JavaScript object. Passed directly, so it should be qualified JS variable. + * Example: '/[a-zA-Z0-9_]+/'. + * @param array $l10n The data itself. The data can be either a single or multi-dimensional array. * @return bool True if the script was successfully localized, false otherwise. */ function wp_localize_script( $handle, $object_name, $l10n ) {