Changeset 56932 for trunk/src/wp-includes/theme-templates.php

Timestamp:

10/13/2023 05:19:31 PM (15 months ago)

Author:

westonruter

Message:

Script Loader: Enqueue inline style for block template skip link in head instead of footer.

• Introduce wp_enqueue_block_template_skip_link() to replace the_block_template_skip_link(). Add to wp_enqueue_scripts action instead of wp_footer.
• Keep inline script for skip link in footer.
• Restore original the_block_template_skip_link() from 6.3 and move to deprecated.php.
• Preserve back-compat for unhooking skip-link by removing the_block_template_skip_link from wp_footer action.

Follow-up to [56682] and [56687].

Props sabernhardt, plugindevs, westonruter, spacedmonkey.
Fixes #59505.
See #58775.
See #58664.

File:

• trunk/src/wp-includes/theme-templates.php (modified) (2 diffs)

trunk/src/wp-includes/theme-templates.php

@@ -100 +100 @@
 
 /**
- * Prints the skip-link script & styles.
+ * Enqueues the skip-link script & styles.
  *
  * @access private
- * @since 5.8.0
+ * @since 6.4.0
  *
  * @global string $_wp_current_template_content
  */
-function the_block_template_skip_link() {
+function wp_enqueue_block_template_skip_link() {
     global $_wp_current_template_content;
+
+    // Back-compat for plugins that disable functionality by unhooking this action.
+    if ( ! has_action( 'wp_footer', 'the_block_template_skip_link' ) ) {
+        return;
+    }
+    remove_action( 'wp_footer', 'the_block_template_skip_link' );
 
     // Early exit if not a block theme.
@@ -208 +214 @@
     $skip_link_script = wp_remove_surrounding_empty_script_tags( ob_get_clean() );
     $script_handle    = 'wp-block-template-skip-link';
-    wp_register_script( $script_handle, false );
+    wp_register_script( $script_handle, false, array(), false, array( 'in_footer' => true ) );
     wp_add_inline_script( $script_handle, $skip_link_script );
     wp_enqueue_script( $script_handle );