Ticket #34334: 34334.5.patch

src/wp-admin/includes/template.php

@@ -1651 +1651 @@
          * but run the hooks anyway since they output JavaScript
          * or other needed content.
          */
-         ?>
+
+        /**
+         * @global string $hook_suffix
+         */
+        global $hook_suffix;
+        ?>
         <div class="hidden">
 <?php
         /** This action is documented in wp-admin/admin-footer.php */
-        do_action( 'admin_footer', '' );
+        do_action( 'admin_footer', $hook_suffix );
+
+        /** This action is documented in wp-admin/admin-footer.php */
+        do_action( "admin_print_footer_scripts-$hook_suffix" );
 
         /** This action is documented in wp-admin/admin-footer.php */
         do_action( 'admin_print_footer_scripts' );

src/wp-includes/class-wp-customize-widgets.php

@@ -800 +800 @@
          */
         public function print_footer_scripts() {
                 /** This action is documented in wp-admin/admin-footer.php */
+                do_action( 'admin_print_footer_scripts-widgets.php' );
+
+                /** This action is documented in wp-admin/admin-footer.php */
                 do_action( 'admin_print_footer_scripts' );
 
                 /** This action is documented in wp-admin/admin-footer.php */

src/wp-admin/includes/class-wp-press-this.php

@@ -1531 +1531 @@
         do_action( 'admin_footer' );
 
         /** This action is documented in wp-admin/admin-footer.php */
+        do_action( 'admin_print_footer_scripts-press-this.php' );
+
+        /** This action is documented in wp-admin/admin-footer.php */
         do_action( 'admin_print_footer_scripts' );
 
         /** This action is documented in wp-admin/admin-footer.php */

src/wp-admin/admin-footer.php

@@ -9 +9 @@
 // don't load directly
 if ( !defined('ABSPATH') )
         die('-1');
+
+/**
+ * @global string $hook_suffix
+ */
+global $hook_suffix;
 ?>
 
 <div class="clear"></div></div><!-- wpbody-content -->
@@ -67 +72 @@
 do_action( 'admin_footer', '' );
 
 /**
+ * Prints scripts and data queued for the footer.
+ *
+ * The dynamic portion of the hook name, `$hook_suffix`,
+ * refers to the global hook suffix of the current page.
+ *
+ * @since 4.6.0
+ *
+ * @global string $hook_suffix
+ * @param string $hook_suffix The current admin page.
+ */
+do_action( "admin_print_footer_scripts-$hook_suffix" );
+
+/**
  * Prints any scripts and data queued for the footer.
  *
  * @since 2.8.0
@@ -76 +94 @@
 /**
  * Print scripts or data after the default footer scripts.
  *
- * The dynamic portion of the hook name, `$GLOBALS['hook_suffix']`,
+ * The dynamic portion of the hook name, `$hook_suffix`,
  * refers to the global hook suffix of the current page.
  *
  * @since 2.8.0
@@ -84 +102 @@
  * @global string $hook_suffix
  * @param string $hook_suffix The current admin page.
  */
-do_action( "admin_footer-" . $GLOBALS['hook_suffix'] );
+do_action( "admin_footer-$hook_suffix" );
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
 if ( function_exists('get_site_option') ) {