From a02b5cc2a8eecb8e076fbb7cf4de7bd2ec8a8eb1 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 5 Jul 2019 01:45:56 +0000 Subject: [PATCH] Coding Standards: Mark the handful of hook names with uppercase characters or hyphens as ignored. See #47632. Built from https://develop.svn.wordpress.org/trunk@45599 git-svn-id: http://core.svn.wordpress.org/trunk@45410 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-footer.php | 4 ++-- wp-admin/admin-header.php | 6 ++--- wp-admin/admin.php | 18 +++++++-------- wp-admin/edit-comments.php | 2 +- wp-admin/edit-tags.php | 4 ++-- wp-admin/edit.php | 2 +- wp-admin/includes/ajax-actions.php | 8 +++---- wp-admin/includes/class-wp-list-table.php | 2 +- wp-admin/includes/dashboard.php | 2 +- wp-admin/includes/media.php | 18 +++++++-------- wp-admin/includes/meta-boxes.php | 2 +- wp-admin/includes/misc.php | 2 +- wp-admin/includes/template.php | 8 +++---- wp-admin/includes/update.php | 4 ++-- wp-admin/link-manager.php | 2 +- wp-admin/network/site-themes.php | 2 +- wp-admin/network/site-users.php | 2 +- wp-admin/network/sites.php | 2 +- wp-admin/network/themes.php | 2 +- wp-admin/network/users.php | 2 +- wp-admin/plugins.php | 2 +- wp-admin/update-core.php | 2 +- wp-admin/update.php | 2 +- wp-admin/upload.php | 2 +- wp-admin/users.php | 2 +- wp-includes/category-template.php | 2 +- wp-includes/class-wp-customize-widgets.php | 16 ++++++------- wp-includes/class-wp-http-requests-hooks.php | 2 +- wp-includes/class-wp-xmlrpc-server.php | 24 ++++++++++---------- wp-includes/comment-template.php | 4 ++-- wp-includes/media-template.php | 10 ++++---- wp-includes/theme.php | 2 +- wp-includes/version.php | 2 +- wp-mail.php | 2 +- 34 files changed, 84 insertions(+), 84 deletions(-) diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php index 6014d1767d..1061f6b9a7 100644 --- a/wp-admin/admin-footer.php +++ b/wp-admin/admin-footer.php @@ -80,7 +80,7 @@ do_action( 'admin_footer', '' ); * * @since 4.6.0 */ -do_action( "admin_print_footer_scripts-{$hook_suffix}" ); +do_action( "admin_print_footer_scripts-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** * Prints any scripts and data queued for the footer. @@ -97,7 +97,7 @@ do_action( 'admin_print_footer_scripts' ); * * @since 2.8.0 */ -do_action( "admin_footer-{$hook_suffix}" ); +do_action( "admin_footer-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores // get_site_option() won't exist when auto upgrading from <= 2.7 if ( function_exists( 'get_site_option' ) ) { diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index d8ebb7942d..525942ed79 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -108,7 +108,7 @@ do_action( 'admin_enqueue_scripts', $hook_suffix ); * * @since 2.6.0 */ -do_action( "admin_print_styles-{$hook_suffix}" ); +do_action( "admin_print_styles-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** * Fires when styles are printed for all admin pages. @@ -122,7 +122,7 @@ do_action( 'admin_print_styles' ); * * @since 2.1.0 */ -do_action( "admin_print_scripts-{$hook_suffix}" ); +do_action( "admin_print_scripts-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** * Fires when scripts are printed for all admin pages. @@ -139,7 +139,7 @@ do_action( 'admin_print_scripts' ); * * @since 2.1.0 */ -do_action( "admin_head-{$hook_suffix}" ); +do_action( "admin_head-{$hook_suffix}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** * Fires in head section for all admin pages. diff --git a/wp-admin/admin.php b/wp-admin/admin.php index 5b68bc593b..34706f60e1 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -228,7 +228,7 @@ if ( isset( $plugin_page ) ) { * * @since 2.1.0 */ - do_action( "load-{$page_hook}" ); + do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores if ( ! isset( $_GET['noheader'] ) ) { require_once( ABSPATH . 'wp-admin/admin-header.php' ); } @@ -272,7 +272,7 @@ if ( isset( $plugin_page ) ) { * * @since 1.5.0 */ - do_action( "load-{$plugin_page}" ); + do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores if ( ! isset( $_GET['noheader'] ) ) { require_once( ABSPATH . 'wp-admin/admin-header.php' ); @@ -313,7 +313,7 @@ if ( isset( $plugin_page ) ) { * * @since 3.5.0 */ - do_action( "load-importer-{$importer}" ); + do_action( "load-importer-{$importer}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores $parent_file = 'tools.php'; $submenu_file = 'import.php'; @@ -362,7 +362,7 @@ if ( isset( $plugin_page ) ) { * * @since 2.1.0 */ - do_action( "load-{$pagenow}" ); + do_action( "load-{$pagenow}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /* * The following hooks are fired to ensure backward compatibility. @@ -370,18 +370,18 @@ if ( isset( $plugin_page ) ) { */ if ( $typenow == 'page' ) { if ( $pagenow == 'post-new.php' ) { - do_action( 'load-page-new.php' ); + do_action( 'load-page-new.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } elseif ( $pagenow == 'post.php' ) { - do_action( 'load-page.php' ); + do_action( 'load-page.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } } elseif ( $pagenow == 'edit-tags.php' ) { if ( $taxnow == 'category' ) { - do_action( 'load-categories.php' ); + do_action( 'load-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } elseif ( $taxnow == 'link_category' ) { - do_action( 'load-edit-link-categories.php' ); + do_action( 'load-edit-link-categories.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } } elseif ( 'term.php' === $pagenow ) { - do_action( 'load-edit-tags.php' ); + do_action( 'load-edit-tags.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } } diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index d3bb7ce068..6fb2945b19 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -106,7 +106,7 @@ if ( $doaction ) { * @param string $doaction The action being taken. * @param array $items The items to take the action on. */ - $redirect_to = apply_filters( "handle_bulk_actions-{$screen}", $redirect_to, $doaction, $comment_ids ); + $redirect_to = apply_filters( "handle_bulk_actions-{$screen}", $redirect_to, $doaction, $comment_ids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } wp_defer_comment_counting( false ); diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 1be66c9dfa..0ad5b8613e 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -201,7 +201,7 @@ switch ( $wp_list_table->current_action() ) { check_admin_referer( 'bulk-tags' ); $tags = (array) $_REQUEST['delete_tags']; /** This action is documented in wp-admin/edit-comments.php */ - $location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags ); + $location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores break; } @@ -613,7 +613,7 @@ endif; * * @param string $taxonomy The taxonomy name. */ -do_action( "after-{$taxonomy}-table", $taxonomy ); +do_action( "after-{$taxonomy}-table", $taxonomy ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores if ( $can_edit_terms ) { ?> diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 08f879f0ee..d17b3309f0 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -183,7 +183,7 @@ if ( $doaction ) { break; default: /** This action is documented in wp-admin/edit-comments.php */ - $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $post_ids ); + $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $post_ids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores break; } diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index baecfa2c45..29cd94c2c8 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -2182,14 +2182,14 @@ function wp_ajax_save_widget() { * * @since 2.8.0 */ - do_action( 'load-widgets.php' ); + do_action( 'load-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** * Fires early when editing the widgets displayed in sidebars. * * @since 2.8.0 */ - do_action( 'widgets.php' ); + do_action( 'widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/widgets.php */ do_action( 'sidebar_admin_setup' ); @@ -2292,9 +2292,9 @@ function wp_ajax_delete_inactive_widgets() { unset( $_POST['removeinactivewidgets'], $_POST['action'] ); /** This action is documented in wp-admin/includes/ajax-actions.php */ - do_action( 'load-widgets.php' ); + do_action( 'load-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/includes/ajax-actions.php */ - do_action( 'widgets.php' ); + do_action( 'widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/widgets.php */ do_action( 'sidebar_admin_setup' ); diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index a846b84f32..021547fd18 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -451,7 +451,7 @@ class WP_List_Table { * * @param string[] $actions An array of the available bulk actions. */ - $this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions ); + $this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores $two = ''; } else { $two = '2'; diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 127bcff90b..f8e648bde1 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -1536,7 +1536,7 @@ function wp_dashboard_browser_nag() { * @param string $notice The notice content. * @param array $response An array containing web browser information. See `wp_check_browser_version()`. */ - echo apply_filters( 'browse-happy-notice', $notice, $response ); + echo apply_filters( 'browse-happy-notice', $notice, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } /** diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index bb8633080a..d6a2116bb8 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -519,7 +519,7 @@ isRtl = ; * * @since 2.9.0 */ - do_action( 'admin_print_styles-media-upload-popup' ); + do_action( 'admin_print_styles-media-upload-popup' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_print_styles' ); @@ -529,7 +529,7 @@ isRtl = ; * * @since 2.9.0 */ - do_action( 'admin_print_scripts-media-upload-popup' ); + do_action( 'admin_print_scripts-media-upload-popup' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_print_scripts' ); @@ -540,7 +540,7 @@ isRtl = ; * * @since 2.9.0 */ - do_action( 'admin_head-media-upload-popup' ); + do_action( 'admin_head-media-upload-popup' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_head' ); @@ -2004,7 +2004,7 @@ function media_upload_form( $errors = null ) { * * @since 2.6.0 */ - do_action( 'pre-upload-ui' ); + do_action( 'pre-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores $post_params = array( 'post_id' => $post_id, @@ -2083,7 +2083,7 @@ wpUploaderInit = ; * @since 2.6.0 As 'pre-flash-upload-ui' * @since 3.3.0 */ - do_action( 'pre-plupload-upload-ui' ); + do_action( 'pre-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores ?>
@@ -2099,7 +2099,7 @@ wpUploaderInit = ; * @since 2.6.0 As 'post-flash-upload-ui' * @since 3.3.0 */ - do_action( 'post-plupload-upload-ui' ); + do_action( 'post-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores ?>
@@ -2110,7 +2110,7 @@ wpUploaderInit = ; * * @since 2.6.0 */ - do_action( 'pre-html-upload-ui' ); + do_action( 'pre-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores ?>

@@ -2125,7 +2125,7 @@ wpUploaderInit = ; * * @since 2.6.0 */ - do_action( 'post-html-upload-ui' ); + do_action( 'post-html-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores ?>

@@ -2139,7 +2139,7 @@ wpUploaderInit = ; * * @since 2.6.0 */ - do_action( 'post-upload-ui' ); + do_action( 'post-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } /** diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index c2433dc44f..2433b3c531 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -775,7 +775,7 @@ function post_comment_status_meta_box( $post ) { * * @param WP_Post $post WP_Post object of the current post. */ - do_action( 'post_comment_status_meta_box-options', $post ); + do_action( 'post_comment_status_meta_box-options', $post ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores ?>

', do_action( 'admin_enqueue_scripts', $hook_suffix ); /** This action is documented in wp-admin/admin-header.php */ - do_action( "admin_print_styles-$hook_suffix" ); + do_action( "admin_print_styles-$hook_suffix" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_print_styles' ); /** This action is documented in wp-admin/admin-header.php */ - do_action( "admin_print_scripts-$hook_suffix" ); + do_action( "admin_print_scripts-$hook_suffix" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_print_scripts' ); /** This action is documented in wp-admin/admin-header.php */ - do_action( "admin_head-$hook_suffix" ); + do_action( "admin_head-$hook_suffix" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_head' ); @@ -1997,7 +1997,7 @@ function iframe_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" ); + do_action( "admin_print_footer_scripts-$hook_suffix" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-footer.php */ do_action( 'admin_print_footer_scripts' ); diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index cb24378ba7..a3a35c8d29 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -507,7 +507,7 @@ function wp_plugin_update_row( $file, $plugin_data ) { * @type string $package Plugin update package URL. * } */ - do_action( "in_plugin_update_message-{$file}", $plugin_data, $response ); + do_action( "in_plugin_update_message-{$file}", $plugin_data, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores echo '

'; } @@ -646,7 +646,7 @@ function wp_theme_update_row( $theme_key, $theme ) { * @type string $package Theme update package URL. * } */ - do_action( "in_theme_update_message-{$theme_key}", $theme, $response ); + do_action( "in_theme_update_message-{$theme_key}", $theme, $response ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores echo '

'; } diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php index 51ae234b1b..177aab229f 100644 --- a/wp-admin/link-manager.php +++ b/wp-admin/link-manager.php @@ -33,7 +33,7 @@ if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) { $redirect_to = add_query_arg( 'deleted', count( $bulklinks ), $redirect_to ); } else { /** This action is documented in wp-admin/edit-comments.php */ - $redirect_to = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $bulklinks ); + $redirect_to = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $bulklinks ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } wp_redirect( $redirect_to ); exit; diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 2e53376446..511f9cee27 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -136,7 +136,7 @@ if ( $action ) { * @param array $items The items to take the action on. * @param int $site_id The site ID. */ - $referer = apply_filters( "handle_network_bulk_actions-{$screen}", $referer, $action, $themes, $id ); + $referer = apply_filters( "handle_network_bulk_actions-{$screen}", $referer, $action, $themes, $id ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } else { $action = 'error'; $n = 'none'; diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 06dd68c2a3..643ca9695d 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -179,7 +179,7 @@ if ( $action ) { check_admin_referer( 'bulk-users' ); $userids = $_REQUEST['users']; /** This action is documented in wp-admin/network/site-themes.php */ - $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id ); + $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores $update = $action; break; } diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php index 6c2de15866..5d4d0882b4 100644 --- a/wp-admin/network/sites.php +++ b/wp-admin/network/sites.php @@ -211,7 +211,7 @@ if ( isset( $_GET['action'] ) ) { $redirect_to = wp_get_referer(); $blogs = (array) $_POST['allblogs']; /** This action is documented in wp-admin/network/site-themes.php */ - $redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id ); + $redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores wp_safe_redirect( $redirect_to ); exit(); } diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index 8034162e2f..f9b0099a25 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -217,7 +217,7 @@ if ( $action ) { check_admin_referer( 'bulk-themes' ); /** This action is documented in wp-admin/network/site-themes.php */ - $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $themes ); + $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $themes ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores wp_safe_redirect( $referer ); exit; diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php index 7f212329f6..aa5bace85f 100644 --- a/wp-admin/network/users.php +++ b/wp-admin/network/users.php @@ -102,7 +102,7 @@ if ( isset( $_GET['action'] ) ) { $user_ids = (array) $_POST['allusers']; /** This action is documented in wp-admin/network/site-themes.php */ - $sendback = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $user_ids ); + $sendback = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $sendback, $doaction, $user_ids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores wp_safe_redirect( $sendback ); exit(); diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index be0c652e59..402c799e6e 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -418,7 +418,7 @@ if ( $action ) { $sendback = wp_get_referer(); /** This action is documented in wp-admin/edit-comments.php */ - $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $action, $plugins ); + $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $action, $plugins ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores wp_safe_redirect( $sendback ); exit; } diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index d88f1376a7..c6e95a35a9 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -885,5 +885,5 @@ if ( 'upgrade-core' == $action ) { * * @since 3.2.0 */ - do_action( "update-core-custom_{$action}" ); + do_action( "update-core-custom_{$action}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } diff --git a/wp-admin/update.php b/wp-admin/update.php index 556ff6e15d..5f465fa827 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -295,6 +295,6 @@ if ( isset( $_GET['action'] ) ) { * * @since 2.8.0 */ - do_action( "update-custom_{$action}" ); + do_action( "update-custom_{$action}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } } diff --git a/wp-admin/upload.php b/wp-admin/upload.php index 6f998ef4a6..72528f4999 100644 --- a/wp-admin/upload.php +++ b/wp-admin/upload.php @@ -199,7 +199,7 @@ if ( $doaction ) { break; default: /** This action is documented in wp-admin/edit-comments.php */ - $location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $doaction, $post_ids ); + $location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $doaction, $post_ids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } wp_redirect( $location ); diff --git a/wp-admin/users.php b/wp-admin/users.php index a7356593e3..fd209b03ae 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -454,7 +454,7 @@ switch ( $wp_list_table->current_action() ) { $sendback = wp_get_referer(); /** This action is documented in wp-admin/edit-comments.php */ - $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $wp_list_table->current_action(), $userids ); + $sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $wp_list_table->current_action(), $userids ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores wp_safe_redirect( $sendback ); exit; diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 47ab304f5f..1b2da3c122 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -1298,7 +1298,7 @@ function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' * * @param string[] $links An array of term links. */ - $term_links = apply_filters( "term_links-{$taxonomy}", $links ); + $term_links = apply_filters( "term_links-{$taxonomy}", $links ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores return $before . join( $sep, $term_links ) . $after; } diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php index 1a3611f5a9..102cd8de21 100644 --- a/wp-includes/class-wp-customize-widgets.php +++ b/wp-includes/class-wp-customize-widgets.php @@ -333,10 +333,10 @@ final class WP_Customize_Widgets { */ public function customize_controls_init() { /** This action is documented in wp-admin/includes/ajax-actions.php */ - do_action( 'load-widgets.php' ); + do_action( 'load-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/includes/ajax-actions.php */ - do_action( 'widgets.php' ); + do_action( 'widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/widgets.php */ do_action( 'sidebar_admin_setup' ); @@ -643,7 +643,7 @@ final class WP_Customize_Widgets { */ public function print_styles() { /** This action is documented in wp-admin/admin-header.php */ - do_action( 'admin_print_styles-widgets.php' ); + do_action( 'admin_print_styles-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_print_styles' ); @@ -657,7 +657,7 @@ final class WP_Customize_Widgets { */ public function print_scripts() { /** This action is documented in wp-admin/admin-header.php */ - do_action( 'admin_print_scripts-widgets.php' ); + do_action( 'admin_print_scripts-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/admin-header.php */ do_action( 'admin_print_scripts' ); @@ -860,13 +860,13 @@ final class WP_Customize_Widgets { */ public function print_footer_scripts() { /** This action is documented in wp-admin/admin-footer.php */ - do_action( 'admin_print_footer_scripts-widgets.php' ); + do_action( 'admin_print_footer_scripts-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** 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 */ - do_action( 'admin_footer-widgets.php' ); + do_action( 'admin_footer-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } /** @@ -1538,10 +1538,10 @@ final class WP_Customize_Widgets { } /** This action is documented in wp-admin/includes/ajax-actions.php */ - do_action( 'load-widgets.php' ); + do_action( 'load-widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/includes/ajax-actions.php */ - do_action( 'widgets.php' ); + do_action( 'widgets.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** This action is documented in wp-admin/widgets.php */ do_action( 'sidebar_admin_setup' ); diff --git a/wp-includes/class-wp-http-requests-hooks.php b/wp-includes/class-wp-http-requests-hooks.php index d918b07757..549f53242c 100644 --- a/wp-includes/class-wp-http-requests-hooks.php +++ b/wp-includes/class-wp-http-requests-hooks.php @@ -69,7 +69,7 @@ class WP_HTTP_Requests_Hooks extends Requests_Hooks { * @param array $request Request data in WP_Http format. * @param string $url URL to request. */ - do_action_ref_array( "requests-{$hook}", $parameters, $this->request, $this->url ); + do_action_ref_array( "requests-{$hook}", $parameters, $this->request, $this->url ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores return $result; } diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php index 3ceeb4206e..72aeef2048 100644 --- a/wp-includes/class-wp-xmlrpc-server.php +++ b/wp-includes/class-wp-xmlrpc-server.php @@ -3073,7 +3073,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $page_id ID of the deleted page. * @param array $args An array of arguments to delete the page. */ - do_action( 'xmlrpc_call_success_wp_deletePage', $page_id, $args ); + do_action( 'xmlrpc_call_success_wp_deletePage', $page_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return true; } @@ -3380,7 +3380,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $cat_id ID of the new category. * @param array $args An array of new category arguments. */ - do_action( 'xmlrpc_call_success_wp_newCategory', $cat_id, $args ); + do_action( 'xmlrpc_call_success_wp_newCategory', $cat_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return $cat_id; } @@ -3430,7 +3430,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $category_id ID of the deleted category. * @param array $args An array of arguments to delete the category. */ - do_action( 'xmlrpc_call_success_wp_deleteCategory', $category_id, $args ); + do_action( 'xmlrpc_call_success_wp_deleteCategory', $category_id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase } return $status; @@ -3677,7 +3677,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $comment_ID ID of the deleted comment. * @param array $args An array of arguments to delete the comment. */ - do_action( 'xmlrpc_call_success_wp_deleteComment', $comment_ID, $args ); + do_action( 'xmlrpc_call_success_wp_deleteComment', $comment_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase } return $status; @@ -3789,7 +3789,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $comment_ID ID of the updated comment. * @param array $args An array of arguments to update the comment. */ - do_action( 'xmlrpc_call_success_wp_editComment', $comment_ID, $args ); + do_action( 'xmlrpc_call_success_wp_editComment', $comment_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return true; } @@ -3926,7 +3926,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $comment_ID ID of the new comment. * @param array $args An array of new comment arguments. */ - do_action( 'xmlrpc_call_success_wp_newComment', $comment_ID, $args ); + do_action( 'xmlrpc_call_success_wp_newComment', $comment_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return $comment_ID; } @@ -5055,7 +5055,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $post_ID ID of the new post. * @param array $args An array of new post arguments. */ - do_action( 'xmlrpc_call_success_blogger_newPost', $post_ID, $args ); + do_action( 'xmlrpc_call_success_blogger_newPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return $post_ID; } @@ -5134,7 +5134,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $post_ID ID of the updated post. * @param array $args An array of arguments for the post to edit. */ - do_action( 'xmlrpc_call_success_blogger_editPost', $post_ID, $args ); + do_action( 'xmlrpc_call_success_blogger_editPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return true; } @@ -5193,7 +5193,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $post_ID ID of the deleted post. * @param array $args An array of arguments to delete the post. */ - do_action( 'xmlrpc_call_success_blogger_deletePost', $post_ID, $args ); + do_action( 'xmlrpc_call_success_blogger_deletePost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return true; } @@ -5545,7 +5545,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $post_ID ID of the new post. * @param array $args An array of arguments to create the new post. */ - do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args ); + do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return strval( $post_ID ); } @@ -5929,7 +5929,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $post_ID ID of the updated post. * @param array $args An array of arguments to update the post. */ - do_action( 'xmlrpc_call_success_mw_editPost', $post_ID, $args ); + do_action( 'xmlrpc_call_success_mw_editPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase return true; } @@ -6364,7 +6364,7 @@ class wp_xmlrpc_server extends IXR_Server { * @param int $id ID of the new attachment. * @param array $args An array of arguments to add the attachment. */ - do_action( 'xmlrpc_call_success_mw_newMediaObject', $id, $args ); + do_action( 'xmlrpc_call_success_mw_newMediaObject', $id, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase $struct = $this->_prepare_media_item( get_post( $id ) ); diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index f00723dd59..24f9830e19 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -277,7 +277,7 @@ function get_comment_author_IP( $comment_ID = 0 ) { // phpcs:ignore WordPress.Na * @param int $comment_ID The comment ID. * @param WP_Comment $comment The comment object. */ - return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment ); + return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase } /** @@ -667,7 +667,7 @@ function get_comment_ID() { // phpcs:ignore WordPress.NamingConventions.ValidFun * @param int $comment_ID The current comment ID. * @param WP_Comment $comment The comment object. */ - return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment ); + return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase } /** diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index 7846695ebb..a307fd8071 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -245,17 +245,17 @@ function wp_print_media_templates() {
diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 108e0e0e3b..ccfa13974a 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -2848,7 +2848,7 @@ function current_theme_supports( $feature ) { * @param array $args Array of arguments for the feature. * @param string $feature The theme feature. */ - return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[ $feature ] ); + return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[ $feature ] ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 486b627a2e..934ed93788 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-45598'; +$wp_version = '5.3-alpha-45599'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-mail.php b/wp-mail.php index 977ed0fc16..797f1afd91 100644 --- a/wp-mail.php +++ b/wp-mail.php @@ -26,7 +26,7 @@ if ( 'mail.example.com' === $mailserver_url || empty( $mailserver_url ) ) { * * @since 2.9.0 */ -do_action( 'wp-mail.php' ); +do_action( 'wp-mail.php' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores /** Get the POP3 class with which to access the mailbox. */ require_once( ABSPATH . WPINC . '/class-pop3.php' );