Fix: regression (multicompany)

This commit is contained in:
Regis Houssin 2012-08-01 12:58:19 +02:00
parent da44fa7186
commit 29fea7bbf4
3 changed files with 18 additions and 18 deletions

View File

@ -1313,9 +1313,9 @@ else
$usergroup=new UserGroup($db); $usergroup=new UserGroup($db);
$groupslist = $usergroup->listGroupsForUser($fuser->id); $groupslist = $usergroup->listGroupsForUser($fuser->id);
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
{
if (! empty($groupslist)) if (! empty($groupslist))
{
if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
{ {
foreach($groupslist as $groupforuser) foreach($groupslist as $groupforuser)
{ {

View File

@ -350,9 +350,9 @@ else
// On selectionne les users qui ne sont pas deja dans le groupe // On selectionne les users qui ne sont pas deja dans le groupe
$exclude = array(); $exclude = array();
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
{
if (! empty($object->members)) if (! empty($object->members))
{
if (! ($conf->multicompany->enabled && $conf->multicompany->transverse_mode))
{ {
foreach($object->members as $useringroup) foreach($object->members as $useringroup)
{ {