holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix PHP 8.0 Warning: Argument #2 of array_merge must be of type array, boolean given

Browse Source
This commit is contained in:
Ralf Becker 2021-10-04 11:01:32 +02:00
parent bde60d58e1
commit eebc939ff2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Vfs/Base.php
View File

@ -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)!