mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
fix for bug #843270: unkillable categories
sub-cats should either be delete or made mains if there parent get deleted
This commit is contained in:
parent
f11dd0e255
commit
b074cbf924
@ -129,7 +129,7 @@
|
||||
|
||||
function delete($cat_id,$subs=False)
|
||||
{
|
||||
return $this->cats->delete($cat_id,$subs);
|
||||
return $this->cats->delete($cat_id,$subs,!$subs); // either delete the subs or modify them
|
||||
}
|
||||
|
||||
function check_values($values)
|
||||
|
@ -106,9 +106,9 @@
|
||||
return $this->cats->formated_list($format,$type,$cat_parent,$global_cats);
|
||||
}
|
||||
|
||||
function delete($cat_id,$drop_subs,$modify_subs=false)
|
||||
function delete($cat_id,$subs)
|
||||
{
|
||||
return $this->cats->delete($cat_id,$drop_subs,$modify_subs);
|
||||
return $this->cats->delete($cat_id,$subs,!$subs); // either delete the subs or modify them
|
||||
}
|
||||
|
||||
function check_values($values)
|
||||
|
@ -551,7 +551,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->bo->delete($cat_id,False,True);
|
||||
$this->bo->delete($cat_id);
|
||||
}
|
||||
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user