mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 16:03:47 +01:00
backported fix for bug #2260 from Jörg
This commit is contained in:
parent
94a10b220e
commit
34a33067db
@ -139,13 +139,17 @@ class boinfolog extends infolog_bo
|
||||
*/
|
||||
function delete($data)
|
||||
{
|
||||
if (is_array($info_id))
|
||||
if (is_array($data))
|
||||
{
|
||||
$delete_children = $info_id['delete_children'];
|
||||
$new_parent = $info_id['new_parent'];
|
||||
$info_id = (int)(isset($info_id[0]) ? $info_id[0] : (isset($info_id['info_id']) ? $info_id['info_id'] : $info_id['info_id']));
|
||||
$delete_children = $data['delete_children'];
|
||||
$new_parent = $data['new_parent'];
|
||||
$info_id = (int)(isset($data[0]) ? $data[0] : $data['info_id']);
|
||||
$status = parent::delete($info_id,$delete_children,$new_parent);
|
||||
}
|
||||
else
|
||||
{
|
||||
$status = parent::delete($data);
|
||||
}
|
||||
$status = parent::delete($info_id,$delete_children,$new_parent);
|
||||
|
||||
if ($status === false)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user