From c02696f43fcee3e9331c3dee67462c7210645962 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Thu, 8 May 2014 11:00:15 +0000 Subject: [PATCH] Rename the `$action` hook in wp-admin/admin-post.php to `admin_post{$action}`. Also, clarify documentation of priv vs nopriv prefixing of the hook name. See #26869. Built from https://develop.svn.wordpress.org/trunk@28351 git-svn-id: http://core.svn.wordpress.org/trunk@28179 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-post.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php index 7103994073..6c290c66b4 100644 --- a/wp-admin/admin-post.php +++ b/wp-admin/admin-post.php @@ -26,7 +26,7 @@ nocache_headers(); /** This action is documented in wp-admin/admin.php */ do_action( 'admin_init' ); -$action = 'admin_post'; +$action = ''; if ( !wp_validate_auth_cookie() ) $action .= '_nopriv'; @@ -37,9 +37,20 @@ if ( !empty($_REQUEST['action']) ) /** * Fires the requested handler action. * - * admin_post_nopriv_{$_REQUEST['action']} is called for not-logged-in users. - * admin_post_{$_REQUEST['action']} is called for logged-in users. + * The dynamic portion of the hook name, $action, refers to a combination + * of whether the user is logged-in or not, and the requested handler action. + * + * If the user is logged-out, '_nopriv' will be affixed to the + * base "admin_post" hook name. If a handler action was passed, that action + * will also be affixed. + * + * For example: + * Hook combinations fired for logged-out users: + * `admin_post_nopriv_{$action}` and `admin_post_nopriv` (no action supplied). + * + * Hook combinations fired for logged-in users: + * `admin_post_{$action}` and `admin_post` (no action supplied). * * @since 2.6.0 */ -do_action( $action ); +do_action( "admin_post{$action}" );