Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2025-05-22 17:06:21 +02:00
commit b2f148da50
4 changed files with 5 additions and 3 deletions

View file

@ -179,7 +179,7 @@ if ($action == 'update') {
$dirforterms = $diroffile.'/';
$original_file = $_FILES[$varname]["name"];
$result = dol_move_uploaded_file($_FILES[$varname]["tmp_name"], $dirforterms.$original_file, 1, 0, $_FILES[$varname]['error']);
if ($result > 0) {
if ((int) $result > 0) {
dolibarr_set_const($db, $varname, $original_file, 'chaine', 0, '', $conf->entity);
}
}

View file

@ -2920,6 +2920,8 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
} elseif ($modulepart == 'expedition' && strpos($original_file, 'receipt/') === 0) {
// Fix modulepart delivery
$modulepart = 'delivery';
} elseif ($modulepart == 'propale') {
$modulepart = 'propal';
}
//print 'dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity;

View file

@ -127,7 +127,7 @@ print '<table class="border centpercent">';
// Product
print '<tr><td class="titlefield">'.$langs->trans('ProductOrService').'</td>';
print '<td class="maxwidthonsmartphone" colspan="4">';
print img_picto('', 'product', 'class="pictofixedwidth"').$form->select_produits(($id > 0 ? $id : ''), 'id', '', 20, 0, 1, 2, '', 1, array(), 0, '', 0, '', 0, '', null, 1);
print img_picto('', 'product', 'class="pictofixedwidth"').$form->select_produits(($id > 0 ? $id : ''), 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 1, 0, '', 0, '', null, 1);
print '</td></tr>';
// Categories

View file

@ -507,7 +507,7 @@ class SecurityGETPOSTTest extends CommonClassTest
// Test that links not on wrapper and not data are disallowed
$result = GETPOST("paramtestsubstit", 'alphanohtml');
print __METHOD__." result=".$result."\n";
$this->assertEquals('XXX XXX 999 XXX 1 XXX 1 XXX', $result, 'Failed to do conversion');
$this->assertEquals('XXX __NOTDEFINED__ XXX 999 XXX 1 XXX 1 XXX', $result, 'Failed to do conversion');
return $result;