-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 );
+if ( ! wp_validate_auth_cookie() ) {
+ if ( empty( $action ) ) {
+ /**
+ * Fires on a non-authenticated admin post request where no action was supplied.
+ *
+ * @since 2.6.0
+ */
+ do_action( 'admin_post_nopriv' );
+ } else {
+ /**
+ * Fires on a non-authenticated admin post request for the given action.
+ *
+ * The dynamic portion of the hook name, `$action`, refers to the given
+ * request action.
+ *
+ * @since 2.6.0
+ */
+ do_action( "admin_post_nopriv_{$action}" );
+ }
+} else {
+ if ( empty( $action ) ) {
+ /**
+ * Fires on an authenticated admin post request where no action was supplied.
+ *
+ * @since 2.6.0
+ */
+ do_action( 'admin_post' );
+ } else {
+ /**
+ * Fires on an authenticated admin post request for the given action.
+ *
+ * The dynamic portion of the hook name, `$action`, refers to the given
+ * request action.
+ *
+ * @since 2.6.0
+ */
+ do_action( "admin_post_{$action}" );
+ }
+}