Changeset 56004 for trunk/src/wp-admin/includes/class-wp-list-table.php

Timestamp:

06/23/2023 05:47:34 PM (3 years ago)

Author:

joedolson

Message:

Administration: Backwards compatibility for new sortable keys.

Replace use of list to parse array keys into variables. list throws errors if the keys don't exist, and many extenders will not define the new array keys. The code path already falls back effectively for empty values.

Also add translator comments to screen reader hidden text, fix a docblock, and fix an HTML error.

Follow up to [r55971].

Props kebbet, chouby, joedolson.
Fixes #32170.

File:

• trunk/src/wp-admin/includes/class-wp-list-table.php (modified) (5 diffs)

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

@@ -1362 +1362 @@
 
                         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] : '';
 
                                 /*
@@ -1398 +1402 @@
                                         }
 
-                                        $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 ) {
@@ -1429 +1437 @@
          * should be provided via get_sortable_columns().
          *
-         * @since 4.3.0
+         * @since 6.3.0
          * @access public
          */
@@ -1458 +1466 @@
 
                         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] : '';
 
                                 if ( ! is_string( $orderby_text ) || '' === $orderby_text ) {
@@ -1480 +1491 @@
                                  */
                                 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;