Ticket #15327: 15327.7.diff

wp-admin/admin-ajax.php

@@ -34 +34 @@
 
 do_action( 'admin_init' );
 
-$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'compression-test', 'imgedit-preview', 'oembed_cache' );
-
-$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',
-        'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', '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',
-        'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
-        'wp-remove-post-lock', 'dismiss-wp-pointer',
+$core_actions = array(
+        'GET'  => array( 'fetch-list', 'ajax-tag-search', 'compression-test', 'imgedit-preview', 'oembed_cache' ),
+        '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',
+                'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', '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',
+                'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
+                'wp-remove-post-lock', 'dismiss-wp-pointer',
+        )
 );
 
 // 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 );
+$method =  ! empty ( $_SERVER['REQUEST_METHOD'] ) ? strtoupper( $_SERVER['REQUEST_METHOD'] ) : 'NONE';
+if ( array_key_exists( $method, $core_actions ) && ! empty( $_REQUEST['action'] ) && in_array( $_REQUEST['action'], $core_actions[$method] ) )
+        add_action( 'wp_ajax_' . $_REQUEST['action'], 'wp_ajax_' . str_replace( '-', '_', $_REQUEST['action'] ), 1 );
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
-        add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
-
 add_action( 'wp_ajax_nopriv_autosave', 'wp_ajax_nopriv_autosave', 1 );
 
 if ( is_user_logged_in() )