Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7
This commit is contained in:
commit
94bb1ac511
@ -130,11 +130,11 @@ class Export
|
|||||||
//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
|
//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
|
||||||
if (! empty($perm[2]))
|
if (! empty($perm[2]))
|
||||||
{
|
{
|
||||||
$bool=$user->rights->$perm[0]->$perm[1]->$perm[2];
|
$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$bool=$user->rights->$perm[0]->$perm[1];
|
$bool=$user->rights->{$perm[0]}->{$perm[1]};
|
||||||
}
|
}
|
||||||
if ($perm[0]=='user' && $user->admin) $bool=true;
|
if ($perm[0]=='user' && $user->admin) $bool=true;
|
||||||
if (! $bool) break;
|
if (! $bool) break;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user