WordPress 4.6.1

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

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index c638d78aad27a3f8d907e9b42afce5be329bd8ed..e0f4464d94dd8c179ba8626903a5c9360beb94e2 100644 (file)
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -1,25 +1,27 @@
 <?php
 /**
 <?php
 /**

- * WordPress AJAX Process Execution.
+ * WordPress Ajax Process Execution

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

- * @link http://codex.wordpress.org/AJAX_in_Plugins
+ * @link https://codex.wordpress.org/AJAX_in_Plugins

  */
 
 /**
  */
 
 /**

- * Executing AJAX process.
+ * Executing Ajax process.

  *
  * @since 2.1.0
  */
 define( 'DOING_AJAX', true );
  *
  * @since 2.1.0
  */
 define( 'DOING_AJAX', true );

-define( 'WP_ADMIN', true );
+if ( ! defined( 'WP_ADMIN' ) ) {
+       define( 'WP_ADMIN', true );
+}

 
 /** Load WordPress Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
 
 /** Load WordPress Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 

-/** Allow for cross-domain requests (from the frontend). */
+/** Allow for cross-domain requests (from the front end). */

 send_origin_headers();
 
 // Require an action parameter
 send_origin_headers();
 
 // Require an action parameter


@@ -38,6 +40,7 @@ require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
 send_nosniff_header();
 nocache_headers();
 
 send_nosniff_header();
 nocache_headers();
 

+/** This action is documented in wp-admin/admin.php */

 do_action( 'admin_init' );
 
 $core_actions_get = array(
 do_action( 'admin_init' );
 
 $core_actions_get = array(


@@ -49,16 +52,24 @@ $core_actions_post = array(
        'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
        'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
        'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
        'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
        'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
        'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',

-       'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', 'closed-postboxes',
+       'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'closed-postboxes',

        'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
        'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
        'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
        'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
        'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
        'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',

-       'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
+       'save-widget', 'delete-inactive-widgets', 'set-post-thumbnail', 'date_format', 'time_format',

        'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
        'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
        'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
        'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
        'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
        'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',

+       'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
+       'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
+       'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username', 'delete-plugin',
+       'search-plugins', 'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme',
+       'install-theme', 'get-post-thumbnail-html',

 );
 
 );
 

+// Deprecated
+$core_actions_post[] = 'wp-fullscreen-save-post';
+

 // Register core Ajax calls.
 if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
        add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
 // Register core Ajax calls.
 if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
        add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );


@@ -68,10 +79,26 @@ if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_po
 
 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 
 
 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 

-if ( is_user_logged_in() )
-       do_action( 'wp_ajax_' . $_REQUEST['action'] ); // Authenticated actions
-else
-       do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] ); // Non-admin actions
-
+if ( is_user_logged_in() ) {
+       /**
+        * Fires authenticated Ajax actions for logged-in users.
+        *
+        * The dynamic portion of the hook name, `$_REQUEST['action']`,
+        * refers to the name of the Ajax action callback being fired.
+        *
+        * @since 2.1.0
+        */
+       do_action( 'wp_ajax_' . $_REQUEST['action'] );
+} else {
+       /**
+        * Fires non-authenticated Ajax actions for logged-out users.
+        *
+        * The dynamic portion of the hook name, `$_REQUEST['action']`,
+        * refers to the name of the Ajax action callback being fired.
+        *
+        * @since 2.8.0
+        */
+       do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
+}

 // Default status
 die( '0' );
 // Default status
 die( '0' );