Ticket #26111: 26111.2.diff

src/wp-includes/class.wp-scripts.php

@@ -184 +184 @@
         }
 
         /**
-         * Localizes a script
+         * Localizes a script.
          *
          * Localizes only if the script has already been added
+         *
+         * @since 2.6.0
+         * @since 4.2.0 The optional `$l10n_is_callable` parameter was added.
+         *
+         * @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
+         *                                         a 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 and `$l10n_is_callable` is true, it will
+         *                                         be invoked at runtime.
+         * @param bool           $l10n_is_callable Optional. Whether `$l10n` when passed as a string should be considered
+         *                                         callable. Added for back-compat. Default false.
+         * @return bool True if the script was successfully localized, false otherwise.
          */
-        public function localize( $handle, $object_name, $l10n ) {
+        public function localize( $handle, $object_name, $l10n, $l10n_is_callable = false ) {
                 if ( $handle === 'jquery' )
                         $handle = 'jquery-core';
 
-                if ( is_callable( $l10n ) ) {
+                if ( is_callable( $l10n ) && true === $l10n_is_callable ) {
                         $l10n = call_user_func( $l10n, $handle, $object_name );
                 }
 

src/wp-includes/functions.wp-scripts.php

@@ -135 +135 @@
  * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
  *
  * @since 2.6.0
+ * @since 4.2.0 The optional `$l10n_is_callable` parameter was added.
  *
  * @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|callable $l10n             The data itself. The data can be either a single or multi-dimensional array.
+ *                                         If a callable is passed and `$l10n_is_callable` is true, it will be invoked
+ *                                         at runtime.
+ * @param bool           $l10n_is_callable Optional. Whether `$l10n` when passed as a string should be considered
+ *                                         callable. Added for back-compat. Default false.
  * @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, $l10n_is_callable = false ) {
         global $wp_scripts;
         if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
@@ -152 +156 @@
                 return false;
         }
 
-        return wp_scripts()->localize( $handle, $object_name, $l10n );
+        return wp_scripts()->localize( $handle, $object_name, $l10n, $l10n_is_callable );
 }
 
 /**