Ticket #26869: admin_post_actions.2.diff

src/wp-admin/admin-post.php

@@ -26 +26 @@
 /** This action is documented in wp-admin/admin.php */
 do_action( 'admin_init' );
 
-$action = 'admin_post';
+$request_action = empty( $_REQUEST['action'] ) ? '' : '_' . $_REQUEST['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 );
+if ( ! wp_validate_auth_cookie() ) {
+        /**
+         * Fires the requested handler action for not-logged-in users.
+         *
+         * The dynamic portion of the hook name, $action, refers to the handler action.
+         *
+         * @since 2.6.0
+         */
+        do_action( "admin_post_nopriv{$request_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{$request_action}" );
+}