Ticket #25017: 25017.1.diff

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

@@ -103 +103 @@
  * @see WP_Scripts::remove() For parameter information.
  */
 function wp_deregister_script( $handle ) {
-        global $wp_scripts;
+        global $wp_scripts, $pagenow;
         if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -111 +111 @@
                 $wp_scripts = new WP_Scripts();
         }
 
-        // Do not allow accidental or negligent deregistering of critical scripts in the admin. Show minimal remorse if the correct hook is used.
-        if ( is_admin() && 'admin_enqueue_scripts' !== current_filter() ) {
-                $no = array(
-                        'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui-core', 'jquery-ui-accordion',
-                        'jquery-ui-autocomplete', 'jquery-ui-button', 'jquery-ui-datepicker', 'jquery-ui-dialog',
-                        'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-menu', 'jquery-ui-mouse',
-                        'jquery-ui-position', 'jquery-ui-progressbar', 'jquery-ui-resizable', 'jquery-ui-selectable',
-                        'jquery-ui-slider', 'jquery-ui-sortable', 'jquery-ui-spinner', 'jquery-ui-tabs',
-                        'jquery-ui-tooltip', 'jquery-ui-widget',
-                        'underscore', 'backbone',
-                );
+        // Do not allow accidental or negligent deregistering of critical scripts in the admin or on the login page. Show minimal remorse if the correct hook is used.
+        $no = array(
+                'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui-core', 'jquery-ui-accordion',
+                'jquery-ui-autocomplete', 'jquery-ui-button', 'jquery-ui-datepicker', 'jquery-ui-dialog',
+                'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-menu', 'jquery-ui-mouse',
+                'jquery-ui-position', 'jquery-ui-progressbar', 'jquery-ui-resizable', 'jquery-ui-selectable',
+                'jquery-ui-slider', 'jquery-ui-sortable', 'jquery-ui-spinner', 'jquery-ui-tabs',
+                'jquery-ui-tooltip', 'jquery-ui-widget',
+                'underscore', 'backbone',
+        );
 
-                if ( in_array( $handle, $no ) ) {
-                        $message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook.' ),
-                                "<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
-                        _doing_it_wrong( __FUNCTION__, $message, '3.6' );
-                        return;
-                }
+        if ( is_admin() && 'admin_enqueue_scripts' !== current_filter() && in_array( $handle, $no ) ) {
+                $message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the frontend theme, use the %2$s hook.' ),
+                        "<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
+                _doing_it_wrong( __FUNCTION__, $message, '3.6' );
+                return;
         }
 
+        if ( 'wp-login.php' === $pagenow && 'login_enqueue_scripts' !== current_filter() && in_array( $handle, $no ) ) {
+                $message = sprintf( __( 'Do not deregister the %1$s script on the login page. To target the frontend theme, use the %2$s hook.' ),
+                        "<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
+                _doing_it_wrong( __FUNCTION__, $message, '3.7' );
+                return;
+        }
+
         $wp_scripts->remove( $handle );
 }