mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 09:05:16 +01:00
fix Api\Storage\Merge::document_editable_action(): Argument #1 ($action) must be of type array, null given
This commit is contained in:
parent
e4f95d9c20
commit
b1780a35bc
@ -2254,16 +2254,19 @@ abstract class Merge
|
|||||||
switch($count)
|
switch($count)
|
||||||
{
|
{
|
||||||
case (count($name_arr) - 1):
|
case (count($name_arr) - 1):
|
||||||
$current_level[$prefix . $file['name']];
|
if (!isset($current_level[$prefix . $file['name']]))
|
||||||
|
{
|
||||||
|
$current_level[$prefix . $file['name']] = [];
|
||||||
|
}
|
||||||
self::document_editable_action($current_level[$prefix . $file['name']], $file);
|
self::document_editable_action($current_level[$prefix . $file['name']], $file);
|
||||||
if($file['mime'] == 'message/rfc822')
|
if ($file['mime'] === 'message/rfc822')
|
||||||
{
|
{
|
||||||
self::document_mail_action($current_level[$prefix . $file['name']], $file);
|
self::document_mail_action($current_level[$prefix . $file['name']], $file);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if(!is_array($current_level[$prefix . $name_arr[$count]]))
|
if (!isset($current_level[$prefix . $name_arr[$count]]))
|
||||||
{
|
{
|
||||||
// create parent folder
|
// create parent folder
|
||||||
$current_level[$prefix . $name_arr[$count]] = array(
|
$current_level[$prefix . $name_arr[$count]] = array(
|
||||||
|
Loading…
Reference in New Issue
Block a user