WordPress 4.0.1-scripts

[autoinstalls/wordpress.git] / wp-admin / admin-post.php

diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php
index d18bf711b357a22f9239b15949c610b22a5b95f9..f05cdf4e2d2ba2de8b1dfb32c95d15af80bd5015 100644 (file)
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -1,33 +1,71 @@
 <?php
 /**
 <?php
 /**

- * WordPress Administration Generic POST Handler.
+ * WordPress Generic Request (POST/GET) Handler
+ *
+ * Intended for form submission handling in themes and plugins.

  *
  * @package WordPress
  * @subpackage Administration
  */
 
  *
  * @package WordPress
  * @subpackage Administration
  */
 

-/** We are located in WordPress Administration Panels */
-define('WP_ADMIN', true);
+/** We are located in WordPress Administration Screens */
+if ( ! defined( 'WP_ADMIN' ) ) {
+       define( 'WP_ADMIN', true );
+}

 
 if ( defined('ABSPATH') )
        require_once(ABSPATH . 'wp-load.php');
 else
 
 if ( defined('ABSPATH') )
        require_once(ABSPATH . 'wp-load.php');
 else

-       require_once('../wp-load.php');
+       require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+
+/** Allow for cross-domain requests (from the frontend). */
+send_origin_headers();

 
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
 
 nocache_headers();
 
 
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
 
 nocache_headers();
 

-do_action('admin_init');
-
-$action = 'admin_post';
-
-if ( !wp_validate_auth_cookie() )
-       $action .= '_nopriv';
-
-if ( !empty($_REQUEST['action']) )
-       $action .= '_' . $_REQUEST['action'];
+/** This action is documented in wp-admin/admin.php */
+do_action( 'admin_init' );

 
 

-do_action($action);
+$action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['action'];

 
 

-?>
\ No newline at end of file
+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}" );
+       }
+}