refs #2658 Fixed incorrect merge

orchidsoftware · May 30, 2024 · 52854bb · 52854bb
1 parent 2ddedf2
commit 52854bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 14.25.1 - 2024-05-30
+
+### Fixed
+- Incorrect merge state and data for async modals [#2658](https://github.com/orchidsoftware/platform/issues/2658)
+
 ## 14.25.0 - 2024-05-30
 
 ### Added

diff --git a/src/Platform/Dashboard.php b/src/Platform/Dashboard.php
@@ -23,7 +23,7 @@ class Dashboard
      *
      * @deprecated Use `Dashboard::version()` instead.
      */
-    public const VERSION = '14.25.0';
+    public const VERSION = '14.25.1';
 
     /**
      * @deprecated

diff --git a/src/Screen/Screen.php b/src/Screen/Screen.php
@@ -141,7 +141,7 @@ public function asyncBuild(string $method, string $slug)
         $repository = $this->callMethod($method, $parameters);
 
         if (is_array($repository)) {
-            $repository = new Repository(array_merge($repository, $state->all()));
+            $repository = new Repository(array_merge($state->all(), $repository));
         }
 
         $view = $this->view($repository)