From 8a44a9e1afd54074ae532fe903a02bd1e0004ec1 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 9 Jul 2024 10:37:43 +0200
Subject: [PATCH] passes the menu as a reference to the on Events instead of
 using a callback function

---
 .../controllers/api/frontend/v1/LvMenu.php    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index 76f5afd2e..22b5a3a3d 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -249,6 +249,7 @@ class LvMenu extends FHCAPI_Controller
 		// Addons Menu Logic
 		// ##########################################################################################		
         $params = [
+			'user'=>$user,
 			'lvid'=>$lvid,
 			'studiensemester_kurzbz'=>$studiensemester_kurzbz,
 			'studiengang_kz'=>$studiengang_kz,
@@ -264,10 +265,8 @@ class LvMenu extends FHCAPI_Controller
 		
 		Events::trigger('lvMenuBuild', 
 						// callback function for the onEvents to add newValues to the $menu
-						function ($addonMenu) use (&$menu) {
-							foreach($addonMenu as $m){
-								$menu[]= $m;
-							}
+						function & () use (&$menu) {
+							return $menu;
 						},
 						$params
 		);
@@ -276,21 +275,15 @@ class LvMenu extends FHCAPI_Controller
 		// Menu sortieren
 		// ##########################################################################################
 		foreach ($menu as $key => $row){
-			if(isset($row['position'])){
-				$pos[$key] = $row['position'];
-			}
+			$pos[$key] = $row['position'];
 		}
 
-		$sortable_menu = array_filter($menu, function($element){
-			return isset($element['position']);
-		});
-
-		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $sortable_menu);
+		array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
 
 		// HTTP response
 		// ##########################################################################################
 
-		$this->terminateWithSuccess($sortable_menu);
+		$this->terminateWithSuccess($menu);
 
 	}