Automated merge from 15.0 to 16.0 by tool pullmerge.sh

This commit is contained in:
Laurent Destailleur 2026-04-10 13:20:00 +02:00
commit bfd39cd1af

View file

@ -71,7 +71,6 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
$value = ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
$loadmethod = GETPOST('loadmethod', 'alpha', 2);
$savemethod = GETPOST('savemethod', 'alpha', 2);
$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
$newelement = $element;
$view = '';
@ -194,11 +193,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
}
}
if (!$error) {
if ((isset($object) && !is_object($object)) || empty($savemethod)) {
$object = new GenericObject($db);
}
if (!$error && isset($object) && is_object($object)) {
// Specific for add_object_linked()
// TODO add a function for variable treatment
$object->ext_fk_element = $newvalue;
@ -206,7 +201,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
$object->fk_element = $fk_element;
$object->element = $element;
$ret = $object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
$ret = $object->setValueFrom($field, $newvalue, $object->table_element, $fk_element, $format);
if ($ret > 0) {
if ($type == 'numeric') {
$value = price($newvalue);