Changeset 48670

Timestamp:

07/28/2020 04:53:03 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Administration: Don't override the $mode global in WP_Screen::render_view_mode() if it's already set.

Follow-up to [48398], [48423], [48424], [48450].

See #49715.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-comments-list-table.php (modified) (2 diffs)
• class-wp-screen.php (modified) (1 diff)

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

@@ -79 +79 @@
 
         /**
+         * @global string $mode           List table view mode.
          * @global int    $post_id
          * @global string $comment_status
@@ -85 +86 @@
          */
         public function prepare_items() {
-                global $post_id, $comment_status, $comment_type, $search;
+                global $mode, $post_id, $comment_status, $comment_type, $search;
 
                 if ( ! empty( $_REQUEST['mode'] ) ) {
                         $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
                         set_user_setting( 'posts_list_mode', $mode );
+                } else {
+                        $mode = get_user_setting( 'posts_list_mode', 'list' );
                 }
 

trunk/src/wp-admin/includes/class-wp-screen.php

@@ -1314 +1314 @@
                 }
 
-                $mode = get_user_setting( 'posts_list_mode', 'list' );
+                if ( ! isset( $mode ) ) {
+                        $mode = get_user_setting( 'posts_list_mode', 'list' );
+                }
 
                 // This needs a submit button.