Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/user/group/perms.php
This commit is contained in:
commit
227f1605f6
@ -100,8 +100,8 @@ if (empty($reshook)) {
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
$object->clearrights();
|
$user->clearrights();
|
||||||
$object->getrights();
|
$user->getrights();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'delrights' && $caneditperms) {
|
if ($action == 'delrights' && $caneditperms) {
|
||||||
@ -116,8 +116,8 @@ if (empty($reshook)) {
|
|||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
$object->clearrights();
|
$user->clearrights();
|
||||||
$object->getrights();
|
$user->getrights();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user