Changeset 38455

Timestamp:

08/30/2016 08:06:30 PM (10 years ago)

Author:

wonderboymusic

Message:

List Tables: AJAX actions for List Tables do not need to declare global $wp_list_table. List tables on admin screens are in global scope, and they contain hooks that don't pass the the list table as context, hence using globals there so that functions can import them. That problem does not exist in the AJAX actions, which are virtually impossible to hook into as is.

See #37699.

Location:

trunk/src/wp-admin/includes

Files:

• ajax-actions.php (modified) (9 diffs)
• list-table.php (modified) (1 diff)

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

@@ -80 +80 @@
  *
  * @since 3.1.0
- *
- * @global WP_List_Table $wp_list_table
  */
 function wp_ajax_fetch_list() {
-        global $wp_list_table;
-
         $list_class = $_GET['list_args']['class'];
         check_ajax_referer( "fetch-list-$list_class", '_ajax_fetch_list_nonce' );
 
         $wp_list_table = _get_list_table( $list_class, array( 'screen' => $_GET['list_args']['screen']['id'] ) );
-        if ( ! $wp_list_table )
+        if ( ! $wp_list_table ) {
                 wp_die( 0 );
-
-        if ( ! $wp_list_table->ajax_user_can() )
-                wp_die( -1 );
+        }
+
+        if ( ! $wp_list_table->ajax_user_can() ) {
+                wp_die( -1 );
+        }
 
         $wp_list_table->ajax_response();
@@ -830 +828 @@
  *
  * @since 3.1.0
- *
- * @global WP_List_Table $wp_list_table
  */
 function wp_ajax_add_tag() {
-        global $wp_list_table;
-
         check_ajax_referer( 'add-tag', '_wpnonce_add-tag' );
         $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
@@ -934 +928 @@
  * @since 3.1.0
  *
- * @global WP_List_Table $wp_list_table
  * @global int           $post_id
  *
@@ -940 +933 @@
  */
 function wp_ajax_get_comments( $action ) {
-        global $wp_list_table, $post_id;
-        if ( empty( $action ) )
+        global $post_id;
+        if ( empty( $action ) ) {
                 $action = 'get-comments';
-
+        }
         check_ajax_referer( $action );
 
         if ( empty( $post_id ) && ! empty( $_REQUEST['p'] ) ) {
                 $id = absint( $_REQUEST['p'] );
-                if ( ! empty( $id ) )
+                if ( ! empty( $id ) ) {
                         $post_id = $id;
-        }
-
-        if ( empty( $post_id ) )
-                wp_die( -1 );
+                }
+        }
+
+        if ( empty( $post_id ) ) {
+                wp_die( -1 );
+        }
 
         $wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 
-        if ( ! current_user_can( 'edit_post', $post_id ) )
-                wp_die( -1 );
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+                wp_die( -1 );
+        }
 
         $wp_list_table->prepare_items();
 
-        if ( !$wp_list_table->has_items() )
+        if ( ! $wp_list_table->has_items() ) {
                 wp_die( 1 );
+        }
 
         $x = new WP_Ajax_Response();
@@ -987 +984 @@
  * @since 3.1.0
  *
- * @global WP_List_Table $wp_list_table
- *
  * @param string $action Action to perform.
  */
 function wp_ajax_replyto_comment( $action ) {
-        global $wp_list_table;
         if ( empty( $action ) )
                 $action = 'replyto-comment';
@@ -1109 +1103 @@
  *
  * @since 3.1.0
- *
- * @global WP_List_Table $wp_list_table
  */
 function wp_ajax_edit_comment() {
-        global $wp_list_table;
-
         check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );
 
@@ -1328 +1318 @@
  * @since 3.1.0
  *
- * @global WP_List_Table $wp_list_table
- *
  * @param string $action Action to perform.
  */
 function wp_ajax_add_user( $action ) {
-        global $wp_list_table;
-        if ( empty( $action ) )
+        if ( empty( $action ) ) {
                 $action = 'add-user';
+        }
 
         check_ajax_referer( $action );
@@ -1608 +1596 @@
  *
  * @since 3.1.0
- *
- * @global WP_List_Table $wp_list_table
  */
 function wp_ajax_inline_save() {
-        global $wp_list_table, $mode;
+        global $mode;
 
         check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
@@ -1708 +1694 @@
  *
  * @since 3.1.0
- *
- * @global WP_List_Table $wp_list_table
  */
 function wp_ajax_inline_save_tax() {
-        global $wp_list_table;
-
         check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
 

trunk/src/wp-admin/includes/list-table.php

@@ -64 +64 @@
  */
 function register_column_headers($screen, $columns) {
-        $wp_list_table = new _WP_List_Table_Compat($screen, $columns);
+        new _WP_List_Table_Compat( $screen, $columns );
 }