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

Timestamp:

10/21/2016 05:00:29 PM (10 years ago)

Author:

ocean90

Message:

Revert [38859] due to an incomplete implementation.

See https://core.trac.wordpress.org/ticket/37128#comment:27.
See #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.
  *
@@ -651 +683 @@
 
     if ( ARRAY_A == $args['output'] ) {
-        $items = wp_list_sort( $items, array(
-            $args['output_key'] => 'ASC',
-        ) );
+        $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
+        usort($items, '_sort_nav_menu_items');
         $i = 1;
         foreach ( $items as $k => $item ) {
@@ -746 +777 @@
                 $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 ) {