[BUGFIX] Check if UC of recycler was ever set

Resolves: #83839 Releases: master Change-Id: I1e72f959a7ec91c3834fc04ddf175c5c8cb441f2 Reviewed-on: https://review.typo3.org/55656 Tested-by: TYPO3com <no-reply@typo3.com> Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de> Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
TYPO3 · Feb 10, 2018 · b8a6ee1 · b8a6ee1
1 parent 4201623
commit b8a6ee1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
@@ -161,8 +161,9 @@ public function dispatch(ServerRequestInterface $request)
     protected function setDataInSession(array $data)
     {
         $beUser = $this->getBackendUser();
-        if (!empty(array_diff_assoc($data, $beUser->uc['tx_recycler']))) {
-            $beUser->uc['tx_recycler'] = array_merge($beUser->uc['tx_recycler'], $data);
+        $recyclerUC = $beUser->uc['tx_recycler'] ?? [];
+        if (!empty(array_diff_assoc($data, $recyclerUC))) {
+            $beUser->uc['tx_recycler'] = array_merge($recyclerUC, $data);
             $beUser->writeUC();
         }
     }