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.


git-svn-id: https://develop.svn.wordpress.org/trunk@28351 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Drew Jaynes (DrewAPicture) 2014-05-08 10:59:17 +00:00
parent b0d7e6fe3c
commit 272f7533dc
1 changed files with 15 additions and 4 deletions

View File

@ -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}" );