Changeset 38928 for trunk/src/wp-includes/nav-menu.php

Timestamp:

10/25/2016 09:25:25 PM (10 years ago)

Author:

ocean90

Message:

General: Introduce a wp_list_sort() helper function, v2.

In addition to wp_list_filter() for filtering a list of objects, and wp_list_pluck() for plucking a certain field out of each object in a list, this new function can be used for sorting a list of objects by specific fields. These functions are now all contained within the new WP_List_Util() class and wp_list_sort() is used in various parts of core for sorting lists.

This was previously committed in [38859] but got reverted in [38862] and [38863]. To fix the previous issues, wp_list_sort() supports now an additional argument to preserve array keys via uasort().

Props flixos90, DrewAPicture, jorbin.
Fixes #37128.

File:

• trunk/src/wp-includes/nav-menu.php (modified) (3 diffs)

trunk/src/wp-includes/nav-menu.php

@@ -559 +559 @@
 
 /**
- * Sort menu items by the desired key.
- *
- * @since 3.0.0
- * @access private
- *
- * @global string $_menu_item_sort_prop
- *
- * @param object $a The first object to compare
- * @param object $b The second object to compare
- * @return int -1, 0, or 1 if $a is considered to be respectively less than, equal to, or greater than $b.
- */
-function _sort_nav_menu_items( $a, $b ) {
-        global $_menu_item_sort_prop;
-
-        if ( empty( $_menu_item_sort_prop ) )
-                return 0;
-
-        if ( ! isset( $a->$_menu_item_sort_prop ) || ! isset( $b->$_menu_item_sort_prop ) )
-                return 0;
-
-        $_a = (int) $a->$_menu_item_sort_prop;
-        $_b = (int) $b->$_menu_item_sort_prop;
-
-        if ( $a->$_menu_item_sort_prop == $b->$_menu_item_sort_prop )
-                return 0;
-        elseif ( $_a == $a->$_menu_item_sort_prop && $_b == $b->$_menu_item_sort_prop )
-                return $_a < $_b ? -1 : 1;
-        else
-                return strcmp( $a->$_menu_item_sort_prop, $b->$_menu_item_sort_prop );
-}
-
-/**
  * Return if a menu item is valid.
  *
@@ -683 +651 @@
 
         if ( ARRAY_A == $args['output'] ) {
-                $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
-                usort($items, '_sort_nav_menu_items');
+                $items = wp_list_sort( $items, array(
+                        $args['output_key'] => 'ASC',
+                ) );
                 $i = 1;
                 foreach ( $items as $k => $item ) {
@@ -777 +746 @@
                                 $menu_item->type_label = __( 'Post Type Archive' );
                                 $post_content = wp_trim_words( $menu_item->post_content, 200 );
-                                $post_type_description = '' == $post_content ? $post_type_description : $post_content; 
+                                $post_type_description = '' == $post_content ? $post_type_description : $post_content;
                                 $menu_item->url = get_post_type_archive_link( $menu_item->object );
                         } elseif ( 'taxonomy' == $menu_item->type ) {