Ticket #39148: 39148.patch

src/wp-admin/edit-comments.php

@@ -83 +83 @@
         }
 
         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.
                  *
                  * 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 hook name, `$screen`, refers to the current screen ID.
+                 *
                  * @since 4.7.0
                  *
                  * @param string $redirect_url The redirect URL.
                  * @param string $doaction     The action being taken.
                  * @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 );
         }
 
         wp_defer_comment_counting( false );

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

@@ -2702 +2702 @@
                         $type = $ext_type;
 
         /** 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 );
 }

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

@@ -732 +732 @@
                  *
                  * @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 );
         }
 
         /**

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

@@ -1162 +1162 @@
                         $per_page = apply_filters( 'edit_categories_per_page', $per_page );
                 } 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 );
                 }
 
                 // Back compat

src/wp-admin/includes/plugin.php

@@ -1025 +1025 @@
                 wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
                 include( WP_PLUGIN_DIR . '/' . $file );
 
-                add_action( 'uninstall_' . $file, $callable );
+                add_action( "uninstall_{$file}", $callable );
 
                 /**
                  * Fires in uninstall_plugin() once the plugin has been uninstalled.
@@ -1035 +1035 @@
                  *
                  * @since 2.7.0
                  */
-                do_action( 'uninstall_' . $file );
+                do_action( "uninstall_{$file}" );
         }
 }
 

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

@@ -124 +124 @@
                                 check_admin_referer( 'bulk-themes' );
                                 $themes = (array) $_POST['checked'];
                                 $n = count( $themes );
+                                $screen = get_current_screen()->id;
                                 /**
                                  * Fires when a custom bulk action should be handled.
                                  *
                                  * 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 hook name, `$screen`, refers to the current screen ID.
+                                 *
                                  * @since 4.7.0
                                  *
                                  * @param string $redirect_url The redirect URL.
@@ -137 +140 @@
                                  * @param array  $items        The items to take the action on.
                                  * @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';
                                 $n = 'none';

src/wp-includes/author-template.php

@@ -148 +148 @@
          * @param int      $user_id          The user ID for the value.
          * @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 );
 }
 
 /**
@@ -174 +174 @@
          * @param string $author_meta The value of the metadata.
          * @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 );
 }
 
 /**

src/wp-includes/bookmark.php

@@ -383 +383 @@
 
         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 ) {
                         $value = esc_html( $value ); // textarea_escaped
@@ -392 +392 @@
                 }
         } 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 ) {
                         $value = esc_attr( $value );

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

@@ -480 +480 @@
                         return false;
                 }
 
+                $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.
                  *
                  * @since 3.4.0
                  *
                  * @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 );
         }

src/wp-includes/option.php

@@ -102 +102 @@
                                         wp_cache_set( 'notoptions', $notoptions, 'options' );
 
                                         /** 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 );
                                 }
                         }
                 }
@@ -114 +114 @@
                         $value = $row->option_value;
                 } 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 );
                 }
         }
 
@@ -300 +300 @@
                 return false;
 
         /** 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 ) {
                         $autoload = 'yes';
@@ -421 +421 @@
         $notoptions = wp_cache_get( 'notoptions', 'options' );
         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;
 
         $serialized_value = maybe_serialize( $value );

src/wp-includes/post.php

@@ -2061 +2061 @@
                          *                        values include 'raw', 'edit', 'db', 'display',
                          *                        '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 );
                 }

src/wp-includes/user.php

@@ -1208 +1208 @@
                 if ( $prefixed ) {
 
                         /** 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 {
 
                         /**