From 02ed477f1bce228ee080e087552a7e5f65dc4135 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Thu, 24 May 2012 06:40:53 +0000 Subject: [PATCH] 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 git-svn-id: http://core.svn.wordpress.org/trunk@20866 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index ffc1e1868..bed8f0946 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -476,6 +476,8 @@ function wp_ajax_delete_meta() { } function wp_ajax_delete_post( $action ) { + if ( empty( $action ) ) + $action = 'delete-post'; $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0; check_ajax_referer( "{$action}_$id" ); @@ -492,6 +494,8 @@ function wp_ajax_delete_post( $action ) { } function wp_ajax_trash_post( $action ) { + if ( empty( $action ) ) + $action = 'trash-post'; $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0; check_ajax_referer( "{$action}_$id" ); @@ -513,10 +517,14 @@ function wp_ajax_trash_post( $action ) { } 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; check_ajax_referer( "{$action}_$id" ); @@ -570,6 +578,8 @@ function wp_ajax_dim_comment() { } function wp_ajax_add_link_category( $action ) { + if ( empty( $action ) ) + $action = 'add-link-category'; check_ajax_referer( $action ); if ( !current_user_can( 'manage_categories' ) ) wp_die( -1 ); @@ -690,6 +700,8 @@ function wp_ajax_get_tagcloud() { function wp_ajax_get_comments( $action ) { global $wp_list_table, $post_id; + if ( empty( $action ) ) + $action = 'get-comments'; check_ajax_referer( $action ); @@ -725,6 +737,8 @@ function wp_ajax_get_comments( $action ) { 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' ); @@ -1008,6 +1022,8 @@ function wp_ajax_add_meta() { function wp_ajax_add_user( $action ) { global $wp_list_table; + if ( empty( $action ) ) + $action = 'add-user'; check_ajax_referer( $action ); if ( ! current_user_can('create_users') )