From 4ca760354fbc7523c27670adc32dbee16a1b4bf0 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 14 Apr 2015 15:13:28 +0000
Subject: [PATCH] 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
---
 wp-includes/class.wp-scripts.php     | 6 +-----
 wp-includes/functions.wp-scripts.php | 9 ++++-----
 wp-includes/version.php              | 2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 988ba792b0..b7c7dedad5 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -163,7 +163,7 @@ class WP_Scripts extends WP_Dependencies {
 
 		$tag = "{$cond_before}<script type='text/javascript' src='$src'></script>\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/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php
index 6f59a03fe9..c4be60c48a 100644
--- a/wp-includes/functions.wp-scripts.php
+++ b/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 ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 033b1b9a69..c099b9161e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.