From de415d321da746b6eeffabe6000aeb650fb1fdeb Mon Sep 17 00:00:00 2001
From: David Rosendo <david@rosendo.pt>
Date: Mon, 17 May 2021 17:45:36 +0100
Subject: [PATCH] Fix possible name colision

If for some reason there is a ACF field with name "title" it will overwrite the original page title. Grouping ACF values into is own object will be easier to find as well as prevent name collision.
---
 wp-rest-api-v2-menus.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/wp-rest-api-v2-menus.php b/wp-rest-api-v2-menus.php
index 77e4105..29fd426 100644
--- a/wp-rest-api-v2-menus.php
+++ b/wp-rest-api-v2-menus.php
@@ -19,9 +19,11 @@ function wp_api_v2_menus_get_all_menus() {
 		if ( class_exists( 'acf' ) ) {
 			$fields = get_fields( $menu );
 			if ( ! empty( $fields ) ) {
+				$menu[ $key ]->acf = new stdClass();
+
 				foreach ( $fields as $field_key => $item ) {
 					// add all acf custom fields
-					$menus[ $key ]->$field_key = $item;
+					$menus[ $key ]->acf->$field_key = $item;
 				}
 			}
 		}
@@ -75,9 +77,11 @@ function wp_api_v2_locations_get_menu_data( $data ) {
 	if ( class_exists( 'acf' ) ) {
 		$fields = get_fields( $menu );
 		if ( ! empty( $fields ) ) {
+			$menu->acf = new stdClass();
+
 			foreach ( $fields as $field_key => $item ) {
 				// add all acf custom fields
-				$menu->$field_key = $item;
+				$menu->acf->$field_key = $item;
 			}
 		}
 	}
@@ -142,9 +146,11 @@ function wp_api_v2_menus_get_menu_items( $id ) {
 		foreach ( $menu_items as $menu_key => $menu_item ) {
 			$fields = get_fields( $menu_item->ID );
 			if ( ! empty( $fields ) ) {
+				$menu_items[$menu_key]->acf = new stdClass();
+
 				foreach ( $fields as $field_key => $item ) {
 					// add all acf custom fields
-					$menu_items[ $menu_key ]->$field_key = $item;
+					$menu_items[ $menu_key ]->acf->$field_key = $item;
 				}
 			}
 		}
@@ -232,9 +238,11 @@ function wp_api_v2_menus_get_menu_data( $data ) {
 	if ( class_exists( 'acf' ) ) {
 		$fields = get_fields( $menu );
 		if ( ! empty( $fields ) ) {
+			$menu->acf = new stdClass();
+
 			foreach ( $fields as $field_key => $item ) {
 				// add all acf custom fields
-				$menu->$field_key = $item;
+				$menu->acf->$field_key = $item;
 			}
 		}
 	}