From be1920b68776702252897d67c8102a398b4aa20a Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Sat, 13 Nov 2021 17:39:33 +0100
Subject: [PATCH] fix PHP 8.0 TypeError: array_keys(): Argument #1 ($array)
 must be of type array, null given

---
 api/src/Storage/Merge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php
index 68dd084b11..94f019af90 100644
--- a/api/src/Storage/Merge.php
+++ b/api/src/Storage/Merge.php
@@ -1752,7 +1752,7 @@ abstract class Merge
 				break;
 			default:
 				$app = str_replace('_merge', '', get_class($this));
-				if(!in_array($app, array_keys($GLOBALS['egw_info']['apps'])))
+				if(!in_array($app, array_keys($GLOBALS['egw_info']['apps'] ?? [])))
 				{
 					$app = false;
 				}