Changeset 38863 for trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.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/customize/class-wp-customize-nav-menu-setting.php (modified) (3 diffs)

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php

@@ -288 +288 @@
         // Make sure the menu objects get re-sorted after an update/insert.
         if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
-            $menus = wp_list_sort( $menus, array(
-                $args['orderby'] => 'ASC',
-            ) );
+            $this->_current_menus_sort_orderby = $args['orderby'];
+            usort( $menus, array( $this, '_sort_menus_by_orderby' ) );
         }
         // @todo add support for $args['hide_empty'] === true
@@ -315 +314 @@
      *
      * @since 4.3.0
-     * @deprecated 4.7.0 Use wp_list_sort()
      * @access protected
-     *
      * @param object $menu1
      * @param object $menu2
@@ -325 +322 @@
      */
     protected function _sort_menus_by_orderby( $menu1, $menu2 ) {
-        _deprecated_function( __METHOD__, '4.7.0', 'wp_list_sort' );
-
         $key = $this->_current_menus_sort_orderby;
         return strcmp( $menu1->$key, $menu2->$key );