Changeset 39600

Timestamp:

12/14/2016 04:17:38 AM (8 years ago)

Author:

johnbillion

Message:

General: Use interpolation instead of concatenation for all dynamic hook names.

This fixes the rendering of the hook names on developer.wordpress.org.

Props keesiemeijer
Fixes #39148

Location:

trunk/src

Files:

• wp-admin/edit-comments.php (modified) (3 diffs)
• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-admin/includes/class-wp-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-screen.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/network/site-themes.php (modified) (3 diffs)
• wp-includes/author-template.php (modified) (2 diffs)
• wp-includes/bookmark.php (modified) (2 diffs)
• wp-includes/class-wp-customize-setting.php (modified) (2 diffs)
• wp-includes/option.php (modified) (4 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)

trunk/src/wp-admin/edit-comments.php

@@ -84 +84 @@
 
     if ( ! in_array( $doaction, array( 'approve', 'unapprove', 'spam', 'unspam', 'trash', 'delete' ), true ) ) {
+        $screen = get_current_screen()->id;
+
         /**
          * Fires when a custom bulk action should be handled.
@@ -89 +91 @@
          * The redirect link should be modified with success or failure feedback
          * from the action to be used to display feedback to the user.
+         *
+         * The dynamic portion of the hook name, `$screen`, refers to the current screen ID.
          *
          * @since 4.7.0
@@ -96 +100 @@
          * @param array  $items        The items to take the action on.
          */
-        $redirect_to = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $comment_ids );
+        $redirect_to = apply_filters( "handle_bulk_actions-{$screen}", $redirect_to, $doaction, $comment_ids );
     }
 

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2703 +2703 @@
 
     /** This filter is documented in wp-admin/includes/media.php */
-    $html = apply_filters( $type . '_send_to_editor_url', $html, $src, $link_text );
+    $html = apply_filters( "{$type}_send_to_editor_url", $html, $src, $link_text );
 
     wp_send_json_success( $html );

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -733 +733 @@
          * @param int $per_page Number of items to be displayed. Default 20.
          */
-        return (int) apply_filters( $option, $per_page );
+        return (int) apply_filters( "{$option}", $per_page );
     }
 

trunk/src/wp-admin/includes/class-wp-screen.php

@@ -1163 +1163 @@
         } else {
             /** This filter is documented in wp-admin/includes/class-wp-list-table.php */
-            $per_page = apply_filters( $option, $per_page );
+            $per_page = apply_filters( "{$option}", $per_page );
         }
 

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

@@ -1026 +1026 @@
         include( WP_PLUGIN_DIR . '/' . $file );
 
-        add_action( 'uninstall_' . $file, $callable );
+        add_action( "uninstall_{$file}", $callable );
 
         /**
@@ -1036 +1036 @@
          * @since 2.7.0
          */
-        do_action( 'uninstall_' . $file );
+        do_action( "uninstall_{$file}" );
     }
 }

trunk/src/wp-admin/network/site-themes.php

@@ -125 +125 @@
                 $themes = (array) $_POST['checked'];
                 $n = count( $themes );
+                $screen = get_current_screen()->id;
+
                 /**
                  * Fires when a custom bulk action should be handled.
@@ -130 +132 @@
                  * The redirect link should be modified with success or failure feedback
                  * from the action to be used to display feedback to the user.
+                 *
+                 * The dynamic portion of the hook name, `$screen`, refers to the current screen ID.
                  *
                  * @since 4.7.0
@@ -136 +140 @@
                  * @param string $action       The action being taken.
                  * @param array  $items        The items to take the action on.
-                 * @param int    $site_id      The site id.
+                 * @param int    $site_id      The site ID.
                  */
-                $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $themes, $id );
+                $referer = apply_filters( "handle_network_bulk_actions-{$screen}", $referer, $action, $themes, $id );
             } else {
                 $action = 'error';

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

@@ -149 +149 @@
      * @param int|bool $original_user_id The original user ID, as passed to the function.
      */
-    return apply_filters( 'get_the_author_' . $field, $value, $user_id, $original_user_id );
+    return apply_filters( "get_the_author_{$field}", $value, $user_id, $original_user_id );
 }
 
@@ -175 +175 @@
      * @param int    $user_id     The user ID.
      */
-    echo apply_filters( 'the_author_' . $field, $author_meta, $user_id );
+    echo apply_filters( "the_author_{$field}", $author_meta, $user_id );
 }
 

trunk/src/wp-includes/bookmark.php

@@ -384 +384 @@
     if ( 'edit' == $context ) {
         /** This filter is documented in wp-includes/post.php */
-        $value = apply_filters( "edit_$field", $value, $bookmark_id );
+        $value = apply_filters( "edit_{$field}", $value, $bookmark_id );
 
         if ( 'link_notes' == $field ) {
@@ -393 +393 @@
     } elseif ( 'db' == $context ) {
         /** This filter is documented in wp-includes/post.php */
-        $value = apply_filters( "pre_$field", $value );
+        $value = apply_filters( "pre_{$field}", $value );
     } else {
         /** This filter is documented in wp-includes/post.php */
-        $value = apply_filters( $field, $value, $bookmark_id, $context );
+        $value = apply_filters( "{$field}", $value, $bookmark_id, $context );
 
         if ( 'attribute' == $context ) {

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

@@ -481 +481 @@
         }
 
+        $id_base = $this->id_data['base'];
+
         /**
          * Fires when the WP_Customize_Setting::save() method is called.
          *
-         * The dynamic portion of the hook name, `$this->id_data['base']` refers to
+         * The dynamic portion of the hook name, `$id_base` refers to
          * the base slug of the setting name.
          *
@@ -491 +493 @@
          * @param WP_Customize_Setting $this WP_Customize_Setting instance.
          */
-        do_action( 'customize_save_' . $this->id_data['base'], $this );
+        do_action( "customize_save_{$id_base}", $this );
 
         $this->update( $value );

trunk/src/wp-includes/option.php

@@ -103 +103 @@
 
                     /** This filter is documented in wp-includes/option.php */
-                    return apply_filters( 'default_option_' . $option, $default, $option, $passed_default );
+                    return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
                 }
             }
@@ -115 +115 @@
         } else {
             /** This filter is documented in wp-includes/option.php */
-            return apply_filters( 'default_option_' . $option, $default, $option, $passed_default );
+            return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
         }
     }
@@ -310 +310 @@
 
     /** This filter is documented in wp-includes/option.php */
-    if ( apply_filters( 'default_option_' . $option, false, $option, false ) === $old_value ) {
+    if ( apply_filters( "default_option_{$option}", false, $option, false ) === $old_value ) {
         // Default setting for new options is 'yes'.
         if ( null === $autoload ) {
@@ -431 +431 @@
     if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
         /** This filter is documented in wp-includes/option.php */
-        if ( apply_filters( 'default_option_' . $option, false, $option, false ) !== get_option( $option ) )
+        if ( apply_filters( "default_option_{$option}", false, $option, false ) !== get_option( $option ) )
             return false;
 

trunk/src/wp-includes/post.php

@@ -2062 +2062 @@
              *                        'attribute' and 'js'.
              */
-            $value = apply_filters( $field, $value, $post_id, $context );
+            $value = apply_filters( "{$field}", $value, $post_id, $context );
         } else {
             $value = apply_filters( "post_{$field}", $value, $post_id, $context );

trunk/src/wp-includes/user.php

@@ -1209 +1209 @@
 
             /** This filter is documented in wp-includes/post.php */
-            $value = apply_filters( $field, $value, $user_id, $context );
+            $value = apply_filters( "{$field}", $value, $user_id, $context );
         } else {