Changeset 20866

Timestamp:

05/24/2012 06:40:53 AM (13 years ago)

Author:

markjaquith

Message:

Set $action for core ajax callbacks, as it will not be provided by the do_action() call until WordPress 3.5. props kurtpayne. fixes #20699

File:

• trunk/wp-admin/includes/ajax-actions.php (modified) (7 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -477 +477 @@
 
 function wp_ajax_delete_post( $action ) {
+    if ( empty( $action ) )
+        $action = 'delete-post';
     $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
@@ -493 +495 @@
 
 function wp_ajax_trash_post( $action ) {
+    if ( empty( $action ) )
+        $action = 'trash-post';
     $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
@@ -514 +518 @@
 
 function wp_ajax_untrash_post( $action ) {
+    if ( empty( $action ) )
+        $action = 'untrash-post';
     wp_ajax_trash_post( $action );
 }
 
 function wp_ajax_delete_page( $action ) {
+    if ( empty( $action ) )
+        $action = 'delete-page';
     $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
@@ -571 +579 @@
 
 function wp_ajax_add_link_category( $action ) {
+    if ( empty( $action ) )
+        $action = 'add-link-category';
     check_ajax_referer( $action );
     if ( !current_user_can( 'manage_categories' ) )
@@ -691 +701 @@
 function wp_ajax_get_comments( $action ) {
     global $wp_list_table, $post_id;
+    if ( empty( $action ) )
+        $action = 'get-comments';
 
     check_ajax_referer( $action );
@@ -726 +738 @@
 function wp_ajax_replyto_comment( $action ) {
     global $wp_list_table, $wpdb;
+    if ( empty( $action ) )
+        $action = 'replyto-comment';
 
     check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
@@ -1009 +1023 @@
 function wp_ajax_add_user( $action ) {
     global $wp_list_table;
+    if ( empty( $action ) )
+        $action = 'add-user';
 
     check_ajax_referer( $action );