Changeset 28350 for trunk/src/wp-admin/admin-post.php

Timestamp:

05/08/2014 10:46:41 AM (10 years ago)

Author:

DrewAPicture

Message:

Revert [28349] in favor of retaining the single dynamic admin_post* hook.

See #26869.

File:

• trunk/src/wp-admin/admin-post.php (modified) (1 diff)

trunk/src/wp-admin/admin-post.php

@@ -27 +27 @@
 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 );