Changeset 60948 for trunk/src/wp-includes/class-wp-scripts.php

Timestamp:

10/16/2025 07:59:11 PM (4 months ago)

Author:

joedolson

Message:

General: Remove support for IE conditional comments.

Remove the ability to enqueue scripts and styles wrapped in IE conditional comment tags. Conditional comment support was removed from IE in version 10 in 2012, and no core supported browser renders them in any way. IE9 has global usage approaching zero. WordPress dropped support for IE10 and below in version 4.8.

Patch adds a deprecation notice if the conditional data argument is added. Scripts and styles are not printed, and neither are their dependencies if they are not required by other non-conditional scripts. Conditional dependencies are removed from core enqueues.

Props jonsurrell, joedolson, shailu25, siliconforks, dmsnell, sabernhardt, rollybueno.
Fixes #63821.

File:

• trunk/src/wp-includes/class-wp-scripts.php (modified) (7 diffs)

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

@@ -293 +293 @@
 
         $obj = $this->registered[ $handle ];
+        if ( $obj->extra['conditional'] ?? false ) {
+            return false;
+        }
 
         if ( null === $obj->ver ) {
@@ -304 +307 @@
         }
 
-        $src                   = $obj->src;
-        $strategy              = $this->get_eligible_loading_strategy( $handle );
-        $intended_strategy     = (string) $this->get_data( $handle, 'strategy' );
-        $ie_conditional_prefix = '';
-        $ie_conditional_suffix = '';
-        $conditional           = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
+        $src               = $obj->src;
+        $strategy          = $this->get_eligible_loading_strategy( $handle );
+        $intended_strategy = (string) $this->get_data( $handle, 'strategy' );
 
         if ( ! $this->is_delayed_strategy( $intended_strategy ) ) {
@@ -334 +334 @@
         }
 
-        if ( $conditional ) {
-            $ie_conditional_prefix = "<!--[if {$conditional}]>\n";
-            $ie_conditional_suffix = "<![endif]-->\n";
-        }
-
         $before_script = $this->get_inline_script_tag( $handle, 'before' );
         $after_script  = $this->get_inline_script_tag( $handle, 'after' );
 
         if ( $before_script || $after_script ) {
-            $inline_script_tag = $ie_conditional_prefix . $before_script . $after_script . $ie_conditional_suffix;
+            $inline_script_tag = $before_script . $after_script;
         } else {
             $inline_script_tag = '';
@@ -379 +374 @@
                 _print_scripts();
                 $this->reset();
-            } elseif ( $this->in_default_dir( $filtered_src ) && ! $conditional ) {
+            } elseif ( $this->in_default_dir( $filtered_src ) ) {
                 $this->print_code     .= $this->print_extra_script( $handle, false );
                 $this->concat         .= "$handle,";
@@ -390 +385 @@
         }
 
-        $has_conditional_data = $conditional && $this->get_data( $handle, 'data' );
-
-        if ( $has_conditional_data ) {
-            echo $ie_conditional_prefix;
-        }
-
         $this->print_extra_script( $handle );
-
-        if ( $has_conditional_data ) {
-            echo $ie_conditional_suffix;
-        }
 
         // A single item may alias a set of items, by having dependencies, but no source.
@@ -454 +439 @@
             $attr['fetchpriority'] = $actual_fetchpriority;
         }
+
         if ( $original_fetchpriority !== $actual_fetchpriority ) {
             $attr['data-wp-fetchpriority'] = $original_fetchpriority;
         }
 
-        $tag  = $translations . $ie_conditional_prefix . $before_script;
+        $tag  = $translations . $before_script;
         $tag .= wp_get_script_tag( $attr );
-        $tag .= $after_script . $ie_conditional_suffix;
+        $tag .= $after_script;
 
         /**
@@ -850 +836 @@
         if ( ! isset( $this->registered[ $handle ] ) ) {
             return false;
+        }
+
+        if ( 'conditional' === $key ) {
+            // If a dependency is declared by a conditional script, remove it.
+            $this->registered[ $handle ]->deps = array();
         }