Changeset 52151

Timestamp:

11/13/2021 12:57:35 AM (5 years ago)

Author:

westonruter

Message:

Embeds: Fix inclusion of wp-embed-template script and style when SCRIPT_DEBUG is disabled.

Amends [52132].
See #44632.

File:

• trunk/src/wp-includes/embed.php (modified) (3 diffs)

trunk/src/wp-includes/embed.php

@@ -473 +473 @@
 
         $output = wp_get_inline_script_tag(
-                file_get_contents( sprintf( ABSPATH . WPINC . '/js/wp-embed' . wp_scripts_get_suffix() . '.js' ) )
+                file_get_contents( ABSPATH . WPINC . '/js/wp-embed' . wp_scripts_get_suffix() . '.js' )
         );
 
@@ -1043 +1043 @@
 function print_embed_styles() {
         $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
+        $suffix    = SCRIPT_DEBUG ? '' : '.min';
         ?>
         <style<?php echo $type_attr; ?>>
-        <?php
-        if ( SCRIPT_DEBUG ) {
-                readfile( ABSPATH . WPINC . '/css/wp-embed-template.css' );
-        } else {
-                /*
-                 * If you're looking at a src version of this file, you'll see an "include"
-                 * statement below. This is used by the `npm run build` process to directly
-                 * include a minified version of wp-oembed-embed.css, instead of using the
-                 * readfile() method from above.
-                 *
-                 * If you're looking at a build version of this file, you'll see a string of
-                 * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
-                 * and edit wp-embed-template.css directly.
-                 */
-                ?>
-                        include "css/wp-embed-template.min.css"
-                <?php
-        }
-        ?>
+                <?php echo file_get_contents( ABSPATH . WPINC . "/css/wp-embed-template$suffix.css" ); ?>
         </style>
         <?php
@@ -1074 +1057 @@
  */
 function print_embed_scripts() {
-        $type_attr = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
-        ?>
-        <script<?php echo $type_attr; ?>>
-        <?php
-        if ( SCRIPT_DEBUG ) {
-                readfile( ABSPATH . WPINC . '/js/wp-embed-template.js' );
-        } else {
-                /*
-                 * If you're looking at a src version of this file, you'll see an "include"
-                 * statement below. This is used by the `npm run build` process to directly
-                 * include a minified version of wp-embed-template.js, instead of using the
-                 * readfile() method from above.
-                 *
-                 * If you're looking at a build version of this file, you'll see a string of
-                 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
-                 * and edit wp-embed-template.js directly.
-                 */
-                ?>
-                        include "js/wp-embed-template.min.js"
-                <?php
-        }
-        ?>
-        </script>
-        <?php
+        wp_print_inline_script_tag(
+                file_get_contents( ABSPATH . WPINC . '/js/wp-embed-template' . wp_scripts_get_suffix() . '.js' )
+        );
 }