Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
865b05aad2
@ -2686,7 +2686,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
|
||||
include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
|
||||
$tmptask = new Task($db);
|
||||
$tmptask->fetch('', $refname);
|
||||
$accessallowed = checkUserAccessToObject($user, array('projet_task'), $tmptask->id, 'projet&project', '', '', 'rowid', '');
|
||||
$accessallowed = checkUserAccessToObject($user, array('projet_task'), $tmptask->id, 'projet_task&project', '', '', 'rowid', '');
|
||||
}
|
||||
}
|
||||
$original_file = $conf->projet->dir_output.'/'.$original_file;
|
||||
|
||||
@ -656,7 +656,7 @@ function checkUserAccessToObject($user, array $featuresarray, $objectid = 0, $ta
|
||||
foreach ($featuresarray as $feature) {
|
||||
$sql = '';
|
||||
|
||||
//var_dump($feature);
|
||||
//var_dump($feature);exit;
|
||||
|
||||
// For backward compatibility
|
||||
if ($feature == 'member') {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user