Changeset 42343 for trunk/src/wp-admin/admin-ajax.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-admin/admin-ajax.php (modified) (2 diffs)

trunk/src/wp-admin/admin-ajax.php

@@ -26 +26 @@
 
 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
+if ( empty( $_REQUEST['action'] ) ) {
     wp_die( '0', 400 );
+}
 
 /** Load WordPress Administration APIs */
@@ -45 +46 @@
 
 $core_actions_get = array(
-    'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
-    'autocomplete-user', 'dashboard-widgets', 'logged-in',
+    'fetch-list',
+    'ajax-tag-search',
+    'wp-compression-test',
+    'imgedit-preview',
+    'oembed-cache',
+    'autocomplete-user',
+    'dashboard-widgets',
+    'logged-in',
 );
 
 $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', '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', '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',
-    'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
-    'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', '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', 'get-community-events', 'edit-theme-plugin-file',
+    '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',
+    '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',
+    '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',
+    'save-user-color-scheme',
+    'update-widget',
+    'query-themes',
+    'parse-embed',
+    'set-attachment-thumbnail',
+    'parse-media-shortcode',
+    'destroy-sessions',
+    'install-plugin',
+    'update-plugin',
+    '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',
+    'get-community-events',
+    'edit-theme-plugin-file',
 );
 
 // Deprecated
 $core_actions_post_deprecated = array( 'wp-fullscreen-save-post', 'press-this-save-post', 'press-this-add-category' );
-$core_actions_post = array_merge( $core_actions_post, $core_actions_post_deprecated );
+$core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );
 
 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
     add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+}
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
+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_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );