Ticket #32170: 32170.11.diff

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

@@ -583 +583 @@
                 <?php
                 if ( ! isset( $_GET['orderby'] ) ) {
                         // In the initial view, Comments are ordered by comment's date but there's no column for that.
-                        echo '<caption class="screen-reader-text">' . __( 'Ordered by Comment Date, descending.' ) . '</p>';
+                        echo '<caption class="screen-reader-text">' .
+                        /* translators: Hidden accessibility text. */
+                        __( 'Ordered by Comment Date, descending.' ) .
+                        '</caption>';
                 } else {
                         $this->print_table_description();
                 }

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

@@ -1361 +1361 @@
                         }
 
                         if ( isset( $sortable[ $column_key ] ) ) {
-                                list( $orderby, $desc_first, $abbr, $orderby_text, $initial_order ) = $sortable[ $column_key ];
+                                $orderby       = isset( $sortable[ $column_key ][0] ) ? $sortable[ $column_key ][0] : '';
+                                $desc_first    = isset( $sortable[ $column_key ][1] ) ? $sortable[ $column_key ][1] : false;
+                                $abbr          = isset( $sortable[ $column_key ][2] ) ? $sortable[ $column_key ][2] : '';
+                                $orderby_text  = isset( $sortable[ $column_key ][3] ) ? $sortable[ $column_key ][3] : '';
+                                $initial_order = isset( $sortable[ $column_key ][4] ) ? $sortable[ $column_key ][4] : '';
 
                                 /*
                                  * We're in the initial view and there's no $_GET['orderby'] then check if the
@@ -1397 +1401 @@
                                                 $order = $desc_first ? 'desc' : 'asc';
                                         }
 
-                                        $class[]    = 'sortable';
-                                        $class[]    = 'desc' === $order ? 'asc' : 'desc';
-                                        $order_text = 'asc' === $order ? __( 'Sort ascending.' ) : __( 'Sort descending.' );
+                                        $class[] = 'sortable';
+                                        $class[] = 'desc' === $order ? 'asc' : 'desc';
+                                        /* translators: Hidden accessibility text. */
+                                        $asc_text = __( 'Sort ascending.' );
+                                        /* translators: Hidden accessibility text. */
+                                        $desc_text  = __( 'Sort descending.' );
+                                        $order_text = 'asc' === $order ? $asc_text : $desc_text;
                                 }
                                 if ( '' !== $order_text ) {
                                         $order_text = ' <span class="screen-reader-text">' . $order_text . '</span>';
@@ -1428 +1436 @@
          * For the table initial view, information about initial orderby and order
          * should be provided via get_sortable_columns().
          *
-         * @since 4.3.0
+         * @since 6.3.0
          * @access public
          */
         public function print_table_description() {
@@ -1457 +1465 @@
                 foreach ( array_keys( $columns ) as $column_key ) {
 
                         if ( isset( $sortable[ $column_key ] ) ) {
+                                $orderby       = isset( $sortable[ $column_key ][0] ) ? $sortable[ $column_key ][0] : '';
+                                $desc_first    = isset( $sortable[ $column_key ][1] ) ? $sortable[ $column_key ][1] : false;
+                                $abbr          = isset( $sortable[ $column_key ][2] ) ? $sortable[ $column_key ][2] : '';
+                                $orderby_text  = isset( $sortable[ $column_key ][3] ) ? $sortable[ $column_key ][3] : '';
+                                $initial_order = isset( $sortable[ $column_key ][4] ) ? $sortable[ $column_key ][4] : '';
 
-                                list( $orderby, $desc_first, $abbr, $orderby_text, $initial_order ) = $sortable[ $column_key ];
-
                                 if ( ! is_string( $orderby_text ) || '' === $orderby_text ) {
                                         return;
                                 }
@@ -1479 +1490 @@
                                  * and true in the sorted views when the actual $_GET['orderby'] is equal to $orderby.
                                  */
                                 if ( $current_orderby == $orderby ) {
-                                        $order_text = 'asc' === $current_order ? __( 'Ascending.' ) : __( 'Descending.' );
-                                        echo '<caption  class="screen-reader-text">' . $orderby_text . ' ' . $order_text . '</p>';
+                                        /* translators: Hidden accessibility text. */
+                                        $asc_text = __( 'Ascending.' );
+                                        /* translators: Hidden accessibility text. */
+                                        $desc_text  = __( 'Descending.' );
+                                        $order_text = 'asc' === $current_order ? $asc_text : $desc_text;
+                                        echo '<caption class="screen-reader-text">' . $orderby_text . ' ' . $order_text . '</caption>';
 
                                         return;
                                 }