WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [31030] and [31033]. Incidentally, there is no lazy-loading happening here anyway. 

Pushing #26111 to future.

Built from https://develop.svn.wordpress.org/trunk@32124


git-svn-id: http://core.svn.wordpress.org/trunk@32103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-04-14 15:13:28 +00:00
parent dafccdd922
commit 4ca760354f
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class.wp-scripts.php
View File

@ -192,10 +192,6 @@ class WP_Scripts extends WP_Dependencies {
if ( $handle === 'jquery' ) if ( $handle === 'jquery' )
$handle = 'jquery-core'; $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 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']; $after = $l10n['l10n_print_after'];
unset($l10n['l10n_print_after']); unset($l10n['l10n_print_after']);

3
wp-includes/functions.wp-scripts.php
View File

@ -141,8 +141,7 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f
* @param string $handle Script handle the data will be attached to. * @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. * @param string $object_name Name for the JavaScript object. Passed directly, so it should be qualified JS variable.
* Example: '/[a-zA-Z0-9_]+/'. * 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 * @param array $l10n The data itself. The data can be either a single or multi-dimensional array.
* is passed, it will be invoked at runtime.
* @return bool True if the script was successfully localized, false otherwise. * @return bool True if the script was successfully localized, false otherwise.
*/ */
function wp_localize_script( $handle, $object_name, $l10n ) { function wp_localize_script( $handle, $object_name, $l10n ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta4-32123'; $wp_version = '4.2-beta4-32124';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.