fix extractState when state is null

orchidsoftware · Dec 8, 2023 · 46fa5b8 · 46fa5b8
1 parent d780d7f
commit 46fa5b8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/Screen/Screen.php b/src/Screen/Screen.php
@@ -188,16 +188,15 @@ public function asyncParticalLayout(Layout $layout, Request $request)
      */
     protected function extractState(): Repository
     {
+        $state = request()->post('_state', session()->get('_state'));
         // Check if the '_state' parameter is missing
-        if (! request()->request->has('_state') && session()->missing('_state')) {
+        if ($state === null) {
             // Return an empty Repository object
             return new Repository();
         }
 
-        // Extract the encrypted state from the '_state' parameter, and deserialize it
-        $raw = request()->post('_state') ?? session()->get('_state');
-
-        return Crypt::decrypt($raw);
+        //deserialize '_state' parameter
+        return Crypt::decrypt($state);
     }
 
     /**