Changeset 37279

Timestamp:

04/21/2016 03:16:52 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Administration: Introduce admin_print_footer_scripts-$hook_suffix", a dynamic version of the admin_print_footer_scripts hook.

This is now more consistent with the generic admin_print_scripts and the dynamic admin_print_scripts-$hook_suffix hooks fired in wp-admin/admin-header.php.

Props tfrommen.
Fixes #34334.

Location:

trunk/src

Files:

• wp-admin/admin-footer.php (modified) (4 diffs)
• wp-admin/includes/class-wp-press-this.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/class-wp-customize-widgets.php (modified) (1 diff)

trunk/src/wp-admin/admin-footer.php

@@ -10 +10 @@
 if ( !defined('ABSPATH') )
     die('-1');
+
+/**
+ * @global string $hook_suffix
+ */
+global $hook_suffix;
 ?>
 
@@ -68 +73 @@
 
 /**
+ * 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.
  *
@@ -77 +95 @@
  * 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.
  *
@@ -85 +103 @@
  * @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

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

@@ -1532 +1532 @@
 
     /** 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' );
 

trunk/src/wp-admin/includes/template.php

@@ -1652 +1652 @@
      * 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 */

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

@@ -801 +801 @@
     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' );