WordPress 4.7

[autoinstalls/wordpress.git] / wp-includes / functions.wp-scripts.php

diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php
index 197368c7c64d2d878e1817ea72e0f119c9a469e4..dccaaf262a954bfdc79fce428984fd2dd5699fce 100644 (file)
--- a/wp-includes/functions.wp-scripts.php
+++ b/wp-includes/functions.wp-scripts.php
@@ -34,24 +34,25 @@ function wp_scripts() {
  * @param string $function Function name.
  */
 function _wp_scripts_maybe_doing_it_wrong( $function ) {
-       if ( did_action( 'init' ) ) {
+       if ( did_action( 'init' ) || did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' ) || did_action( 'login_enqueue_scripts' ) ) {
                return;
        }
 
        _doing_it_wrong( $function, sprintf(
+               /* translators: 1: wp_enqueue_scripts, 2: admin_enqueue_scripts, 3: login_enqueue_scripts */
                __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
                '<code>wp_enqueue_scripts</code>',
                '<code>admin_enqueue_scripts</code>',
                '<code>login_enqueue_scripts</code>'
-       ), '3.3' );
+       ), '3.3.0' );
 }
 
 /**
- * Print scripts in document head that are in the $handles queue.
+ * Prints scripts in document head that are in the $handles queue.
  *
- * Called by admin-header.php and wp_head hook. Since it is called by wp_head on every page load,
+ * Called by admin-header.php and {@see 'wp_head'} hook. Since it is called by wp_head on every page load,
  * the function does not instantiate the WP_Scripts object unless script names are explicitly passed.
- * Makes use of already-instantiated $wp_scripts global if present. Use provided wp_print_scripts
+ * Makes use of already-instantiated $wp_scripts global if present. Use provided {@see 'wp_print_scripts'}
  * hook to register/enqueue new scripts.
  *
  * @see WP_Scripts::do_items()
@@ -107,7 +108,12 @@ function wp_add_inline_script( $handle, $data, $position = 'after' ) {
        _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
        if ( false !== stripos( $data, '</script>' ) ) {
-               _doing_it_wrong( __FUNCTION__, __( 'Do not pass script tags to wp_add_inline_script().' ), '4.5.0' );
+               _doing_it_wrong( __FUNCTION__, sprintf(
+                       /* translators: 1: <script>, 2: wp_add_inline_script() */
+                       __( 'Do not pass %1$s tags to %2$s.' ),
+                       '<code>&lt;script&gt;</code>',
+                       '<code>wp_add_inline_script()</code>'
+               ), '4.5.0' );
                $data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
        }
 
@@ -219,9 +225,13 @@ function wp_deregister_script( $handle ) {
                );
 
                if ( in_array( $handle, $no ) ) {
-                       $message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
-                               "<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
-                       _doing_it_wrong( __FUNCTION__, $message, '3.6' );
+                       $message = sprintf(
+                               /* translators: 1: script name, 2: wp_enqueue_scripts */
+                               __( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
+                               "<code>$handle</code>",
+                               '<code>wp_enqueue_scripts</code>'
+                       );
+                       _doing_it_wrong( __FUNCTION__, $message, '3.6.0' );
                        return;
                }
        }
@@ -242,6 +252,7 @@ function wp_deregister_script( $handle ) {
  *
  * @param string           $handle    Name of the script. Should be unique.
  * @param string           $src       Full URL of the script, or path of the script relative to the WordPress root directory.
+ *                                    Default empty.
  * @param array            $deps      Optional. An array of registered script handles this script depends on. Default empty array.
  * @param string|bool|null $ver       Optional. String specifying script version number, if it has one, which is added to the URL
  *                                    as a query string for cache busting purposes. If version is set to false, a version
@@ -250,7 +261,7 @@ function wp_deregister_script( $handle ) {
  * @param bool             $in_footer Optional. Whether to enqueue the script before </body> instead of in the <head>.
  *                                    Default 'false'.
  */
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_script( $handle, $src = '', $deps = array(), $ver = false, $in_footer = false ) {
        $wp_scripts = wp_scripts();
 
        _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );