Update FileUploadTrait

#126

Author: KarolisNarkevicius

src/Controllers/publish/FileUploadTrait

@@ -17,6 +17,7 @@ trait FileUploadTrait
             mkdir(public_path('uploads'), 0777);
             mkdir(public_path('uploads/thumb'), 0777);
         }
+        $newRequest = null; // Variable to hold a new request created by above array merging
         foreach ($request->all() as $key => $value) {
             if ($request->hasFile($key)) {
                 if ($request->has($key . '_w') && $request->has($key . '_h')) {
@@ -39,15 +40,21 @@ trait FileUploadTrait
                         });
                     }
                     $image->save(public_path('uploads') . '/' . $filename);
-                    $request = new Request(array_merge($request->all(), [$key => $filename]));
+                    // Determine which request's data to use further
+                    $requestDataToMerge = $newRequest == null ? $request->all() : $newRequest->all();
+                    // Create new request without changing the original one (prevents removal of specific metadata which disables parsing of a second file)
+                    $newRequest = new Request(array_merge($requestDataToMerge, [$key => $filename]));
                 } else {
                     $filename = time() . '-' . $request->file($key)->getClientOriginalName();
                     $request->file($key)->move(public_path('uploads'), $filename);
-                    $request = new Request(array_merge($request->all(), [$key => $filename]));
+                    // Determine which request's data to use further
+                    $requestDataToMerge = $newRequest == null ? $request->all() : $newRequest->all();
+                    // Create new request without changing the original one (prevents removal of specific metadata which disables parsing of a second file)
+                    $newRequest = new Request(array_merge($requestDataToMerge, [$key => $filename]));
                 }
             }
         }
 
-        return $request;
+        return $newRequest == null ? $request : $newRequest;
     }
-}
+}