From b0d7e6fe3c32736f477a88368e31d6584336ed47 Mon Sep 17 00:00:00 2001
From: "Drew Jaynes (DrewAPicture)" <drewapicture@git.wordpress.org>
Date: Thu, 8 May 2014 10:46:41 +0000
Subject: [PATCH] Revert [28349] in favor of retaining the single dynamic
 `admin_post*` hook.

See #26869.


git-svn-id: https://develop.svn.wordpress.org/trunk@28350 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/admin-post.php | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/wp-admin/admin-post.php b/src/wp-admin/admin-post.php
index 40200a3490..7103994073 100644
--- a/src/wp-admin/admin-post.php
+++ b/src/wp-admin/admin-post.php
@@ -26,24 +26,20 @@ nocache_headers();
 /** This action is documented in wp-admin/admin.php */
 do_action( 'admin_init' );
 
-$action = empty( $_REQUEST['action'] ) ? '' : '_' . $_REQUEST['action'];
+$action = 'admin_post';
 
-if ( ! wp_validate_auth_cookie() ) {
-	/**
-	 * Fires the requested handler action for logged-out users.
-	 *
-	 * The dynamic portion of the hook name, $action, refers to the handler action.
-	 *
-	 * @since 2.6.0
-	 */
-	do_action( "admin_post_nopriv{$action}" );
-} else {
-	/**
-	 * Fires the requested handler action for logged-in users.
-	 *
-	 * The dynamic portion of the hook name, $action, refers to the handler action.
-	 *
-	 * @since 2.6.0
-	 */
-	do_action( "admin_post{$action}" );
-}
+if ( !wp_validate_auth_cookie() )
+	$action .= '_nopriv';
+
+if ( !empty($_REQUEST['action']) )
+	$action .= '_' . $_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.
+ *
+ * @since 2.6.0
+ */
+do_action( $action );