diff --git a/layouts/v7/modules/Users/DeleteUser.tpl b/layouts/v7/modules/Users/DeleteUser.tpl index 09aad4589876256b09cbf90356631381435d712e..a5c81d0da55c8096555483f9de243c3918b5aea5 100644 --- a/layouts/v7/modules/Users/DeleteUser.tpl +++ b/layouts/v7/modules/Users/DeleteUser.tpl @@ -35,7 +35,7 @@ </div> </div> - {if !isset($PERMANENT)} + {if !isset($PERMANENT)|| !$PERMANENT } <div class="form-group"> <label class="control-label fieldLabel col-sm-4"></label> <div class="controls fieldValue col-sm-8"> diff --git a/vtlib/Vtiger/AccessControl.php b/vtlib/Vtiger/AccessControl.php index 7ed762751b26579299ef0ad850cbc1a2dfff7efb..dddc174d3615c1d550ecf3f8f24e2b560fc41ef3 100644 --- a/vtlib/Vtiger/AccessControl.php +++ b/vtlib/Vtiger/AccessControl.php @@ -49,7 +49,7 @@ class Vtiger_AccessControl { self::$singleton = new self(); } - if (isset(self::$singleton->privileges[$id]) && self::$singleton->privileges && self::$singleton->privileges[$id]) { + if ( self::$singleton->privileges && isset(self::$singleton->privileges[$id])&& self::$singleton->privileges[$id]) { unset(self::$singleton->privileges[$id]); } }