From eebc939ff208a6baa82d2c9d7be386a321104cee Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 4 Oct 2021 11:01:32 +0200
Subject: [PATCH] fix PHP 8.0 Warning: Argument #2 of array_merge must be of
 type array, boolean given

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

diff --git a/api/src/Vfs/Base.php b/api/src/Vfs/Base.php
index 40708dcfc7..9f9eea7486 100644
--- a/api/src/Vfs/Base.php
+++ b/api/src/Vfs/Base.php
@@ -295,7 +295,7 @@ class Base
 			'host' => $GLOBALS['egw_info']['user']['domain'],
 			'home' => str_replace(array('\\\\', '\\'), array('', '/'), $GLOBALS['egw_info']['user']['homedirectory']),
 		);
-		$parts = array_merge(Vfs::parse_url($_path), Vfs::parse_url($path), $defaults);
+		$parts = array_merge(Vfs::parse_url($_path), Vfs::parse_url($path) ?: [], $defaults);
 		if(!$parts['host'])
 		{
 			// otherwise we get an invalid url (scheme:///path/to/something)!