diff -r 34716fd837a4 -r be944660c56a wp/wp-includes/functions.wp-scripts.php --- a/wp/wp-includes/functions.wp-scripts.php Tue Dec 15 15:52:01 2020 +0100 +++ b/wp/wp-includes/functions.wp-scripts.php Wed Sep 21 18:19:35 2022 +0200 @@ -122,7 +122,7 @@ * @see WP_Scripts::add_inline_script() * * @param string $handle Name of the script to add the inline script to. - * @param string $data String containing the javascript to be added. + * @param string $data String containing the JavaScript to be added. * @param string $position Optional. Whether to add the inline script before the handle * or after. Default 'after'. * @return bool True on success, false on failure. @@ -258,9 +258,13 @@ * * @since 2.1.0 * + * @global string $pagenow + * * @param string $handle Name of the script to be removed. */ function wp_deregister_script( $handle ) { + global $pagenow; + _wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle ); /** @@ -269,7 +273,7 @@ */ $current_filter = current_filter(); if ( ( is_admin() && 'admin_enqueue_scripts' !== $current_filter ) || - ( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter ) + ( 'wp-login.php' === $pagenow && 'login_enqueue_scripts' !== $current_filter ) ) { $not_allowed = array( 'jquery', @@ -300,13 +304,16 @@ ); if ( in_array( $handle, $not_allowed, true ) ) { - $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.' ), - "$handle", - 'wp_enqueue_scripts' + _doing_it_wrong( + __FUNCTION__, + 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.' ), + "$handle", + 'wp_enqueue_scripts' + ), + '3.6.0' ); - _doing_it_wrong( __FUNCTION__, $message, '3.6.0' ); return; } }