Merge branch 'master' of https://github.com/unfulvio/wp-api-menus

Author: unfulvio

includes/wp-api-menus-v2.php

@@ -183,7 +183,7 @@ private function nested_menu_items( &$menu_items, $parent = null ) {
 
             // Separate menu_items into parents & children.
             array_map( function( $i ) use ( $parent, &$children, &$parents ){
-                if ( $i['ID'] != $parent && $i['parent'] == $parent ) {
+                if ( $i['id'] != $parent && $i['parent'] == $parent ) {
                     $parents[] = $i;
                 } else {
                     $children[] = $i;
@@ -192,8 +192,8 @@ private function nested_menu_items( &$menu_items, $parent = null ) {
 
             foreach ( $parents as &$parent ) {
 
-                if ( $this->has_children( $children, $parent['ID'] ) ) {
-                    $parent['children'] = $this->nested_menu_items( $children, $parent['ID'] );
+                if ( $this->has_children( $children, $parent['id'] ) ) {
+                    $parent['children'] = $this->nested_menu_items( $children, $parent['id'] );
                 }
             }
 
@@ -271,41 +271,52 @@ public function get_menu_location( $request ) {
 
             $wp_menu = wp_get_nav_menu_object( $locations[ $location ] );
             $menu_items = wp_get_nav_menu_items( $wp_menu->term_id );
-            $sorted_menu_items = $top_level_menu_items = $menu_items_with_children = array();
 
-            foreach ( (array) $menu_items as $menu_item ) {
-	            $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
-            }
-            foreach ( $sorted_menu_items as $menu_item ) {
-	            if ( (int) $menu_item->menu_item_parent !== 0 ) {
-		            $menu_items_with_children[ $menu_item->menu_item_parent ] = true;
-	            } else {
-		            $top_level_menu_items[] = $menu_item;
-	            }
-            }
-
-            $menu = array();
-
-            while ( $sorted_menu_items ) :
-
-                $i = 0;
-                foreach ( $top_level_menu_items as $top_item ) :
-
-                    $menu[ $i ] = $this->format_menu_item( $top_item, false );
-                    if ( isset( $menu_items_with_children[ $top_item->ID ] ) ) {
-	                    $menu[ $i ]['children'] = $this->get_nav_menu_item_children( $top_item->ID, $menu_items, false );
-                    } else {
-	                    $menu[ $i ]['children'] = array();
-                    }
-
-                    $i++;
-                endforeach;
-
-                break;
-
-            endwhile;
-
-            return $menu;
+			/**
+			 * wp_get_nav_menu_items() outputs a list that's already sequenced correctly.
+			 * So the easiest thing to do is to reverse the list and then build our tree
+			 * from the ground up
+			 */
+			$rev_items = array_reverse ( $menu_items );
+			$rev_menu = array();
+			$cache = array();
+			foreach ( $rev_items as $item ) :
+				$formatted = array(
+					'ID'          => abs( $item->ID ),
+					'order'       => (int) $item->menu_order,
+					'parent'      => abs( $item->menu_item_parent ),
+					'title'       => $item->title,
+					'url'         => $item->url,
+					'attr'        => $item->attr_title,
+					'target'      => $item->target,
+					'classes'     => implode( ' ', $item->classes ),
+					'xfn'         => $item->xfn,
+					'description' => $item->description,
+					'object_id'   => abs( $item->object_id ),
+					'object'      => $item->object,
+					'type'        => $item->type,
+					'type_label'  => $item->type_label,
+					'children'    => array(),
+				);
+				// Pickup my children
+				if ( array_key_exists ( $item->ID , $cache ) ) {
+					$formatted['children'] = array_reverse ( $cache[ $item->ID ] );
+				}
+				
+            	$formatted = apply_filters( 'rest_menus_format_menu_item', $formatted );
+				
+				if ( $item->menu_item_parent != 0 ) {
+					// Wait for parent to pick me up
+					if ( array_key_exists ( $item->menu_item_parent , $cache ) ) {
+						array_push( $cache[ $item->menu_item_parent ], $formatted );
+					} else {
+						$cache[ $item->menu_item_parent ] = array( $formatted, );
+					}
+				} else {
+					array_push( $rev_menu, $formatted );
+				}
+			endforeach;
+			return array_reverse ( $rev_menu );
         }
 
 

wp-api-menus.php

@@ -48,9 +48,10 @@
 	 */
     function wp_rest_menus_init() {
 
-        if ( ! in_array( 'json-rest-api/plugin.php', get_option( 'active_plugins' ) ) ) {
-            $class = new WP_REST_Menus();
-            add_filter( 'rest_api_init', array( $class, 'register_routes' ) );
+        if ( ! defined( 'JSON_API_VERSION' ) &&
+             ! in_array( 'json-rest-api/plugin.php', get_option( 'active_plugins' ) ) ) {
+							 $class = new WP_REST_Menus();
+							 add_filter( 'rest_api_init', array( $class, 'register_routes' ) );
         } else {
             $class = new WP_JSON_Menus();
             add_filter( 'json_endpoints', array( $class, 'register_routes' ) );