mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 17:04:14 +01:00
fix PHP 8.0 Warning: Argument #2 of array_merge must be of type array, boolean given
This commit is contained in:
parent
bde60d58e1
commit
eebc939ff2
@ -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)!
|
||||
|
Loading…
Reference in New Issue
Block a user