WordPress 4.1.3

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

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index f7aae0ff52b46ff41c4d468f21feea4fcbc9fda5..a3571afb585248dbf7957889d138b7e4c7bb8d6e 100644 (file)
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -14,7 +14,9 @@
  * @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' );
@@ -58,7 +60,8 @@ $core_actions_post = array(
        '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',
+       'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
+       'parse-media-shortcode', 'destroy-sessions'
 );
 
 // Register core Ajax calls.
@@ -74,7 +77,7 @@ if ( is_user_logged_in() ) {
        /**
         * Fires authenticated AJAX actions for logged-in users.
         *
-        * The dynamic portion of the hook name, $_REQUEST['action'],
+        * The dynamic portion of the hook name, `$_REQUEST['action']`,
         * refers to the name of the AJAX action callback being fired.
         *
         * @since 2.1.0
@@ -84,7 +87,7 @@ if ( is_user_logged_in() ) {
        /**
         * Fires non-authenticated AJAX actions for logged-out users.
         *
-        * The dynamic portion of the hook name, $_REQUEST['action'],
+        * The dynamic portion of the hook name, `$_REQUEST['action']`,
         * refers to the name of the AJAX action callback being fired.
         *
         * @since 2.8.0