vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-03 14:17:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [38859] due to an incomplete implementation.

Browse Source 
See https://core.trac.wordpress.org/ticket/37128#comment:27.
See #37128.

git-svn-id: https://develop.svn.wordpress.org/trunk@38863 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90)
2016-10-21 17:00:29 +00:00
parent 2d7c2823b6
commit ef43d7b0fa
10 changed files with 143 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php
+2 -3
View File
@@ -532,9 +532,8 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
}
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 ) {
src/wp-includes/customize/class-wp-customize-nav-menu-setting.php
+2 -7
View File
@@ -287,9 +287,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
// 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
@@ -314,9 +313,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
* This is a workaround for a lack of closures.
*
* @since 4.3.0
* @deprecated 4.7.0 Use wp_list_sort()
* @access protected
*
* @param object $menu1
* @param object $menu2
* @return int
@@ -324,8 +321,6 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
* @see WP_Customize_Nav_Menu_Setting::filter_wp_get_nav_menus()
*/
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 );
}