From 5cbd386f9b3dc52d722ba638b258271edd85b532 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 12 Nov 2021 14:06:56 +0100
Subject: [PATCH] wait #4877

---
 src/app/CubistCrudPanel.php         |  7 -------
 src/app/Middleware/BunchRequest.php | 22 ++++++----------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/app/CubistCrudPanel.php b/src/app/CubistCrudPanel.php
index 24d830b..62c77a4 100644
--- a/src/app/CubistCrudPanel.php
+++ b/src/app/CubistCrudPanel.php
@@ -164,11 +164,4 @@ class CubistCrudPanel extends CrudPanel
         }
         return $this->entry;
     }
-
-
-
-    public function getStrippedSaveRequest()
-    {
-        dd($this->getRequest());
-    }
 }
diff --git a/src/app/Middleware/BunchRequest.php b/src/app/Middleware/BunchRequest.php
index ea37c8b..4bb4b97 100644
--- a/src/app/Middleware/BunchRequest.php
+++ b/src/app/Middleware/BunchRequest.php
@@ -13,35 +13,25 @@ class BunchRequest extends CubistMiddleware
         parent::handle($request, $next);
 
         $appendComposite = [];
+        $newBag = [];
         foreach ($request->all() as $field => $content) {
-            $initialContent = $content;
-            $initialField = $field;
-
-            $change = false;
-            $unsetInitial = false;
             $e = explode('___', $field);
             if (count($e) > 1) {
-                $change = false;
+
                 $unsetInitial = true;
                 $field = $e[0];
                 for ($i = 1; $i < count($e); $i++) {
                     $field .= '.' . $e[$i];
                 }
                 Arr::set($appendComposite, $field, $content);
-            }
-
-            if ($change) {
-                $request->request->set($field, $content);
-            }
-            if ($unsetInitial) {
-                $request->request->set($initialField, null);
+            } else {
+                $newBag[$field] = $content;
             }
         }
 
+        $newBag = array_merge($newBag, $appendComposite);
+        $request->request->replace($newBag);
 
-        foreach ($appendComposite as $key => $value) {
-            $request->request->set($key, $value);
-        }
         return $this->getResponse();
     }
 }
-- 
2.39.5