Commit 321da860 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch...

Merge branch '5713-groups-of-groups-mail-problems-deletion-without-warning-and-mail-settings-prohibited' into '1.3-dev'

Resolve "Groups of groups mail problems - deletion without warning and mail settings prohibited."

See merge request fusiondirectory/fd!120
Showing with 7 additions and 5 deletions
+7 -5
......@@ -143,21 +143,23 @@ class ogrouptabs extends simpleTabs_noSpecial
function save()
{
$errors = parent::save();
foreach ($this->removed_tabs as $key => &$obj) {
if (isset($this->by_object[$key])) {
continue;
}
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, "Removing");
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $key, 'Removing');
$obj->dn = $this->dn;
$errors = $obj->remove(FALSE);
if (!empty($errors)) {
msg_dialog::displayChecks($errors);
$tabErrors = $obj->remove(FALSE);
if (!empty($tabErrors)) {
$errors = array_merge($errors, $tabErrors);
}
}
unset($obj);
return parent::save();
return $errors;
}
function save_object($save_current = FALSE)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment