fix PHP 8.0 Warning: Argument #2 of array_merge must be of type array…

…, boolean given
EGroupware · Oct 4, 2021 · eebc939 · eebc939
1 parent bde60d5
commit eebc939
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/src/Vfs/Base.php b/api/src/Vfs/Base.php
@@ -295,7 +295,7 @@ static function resolve_url($_path, $do_symlink = true, $use_symlinkcache = true
 			'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)!