lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-16 19:01:03 +02:00
commit 8c18837095
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/extrafields.class.php
View File

@ -1613,7 +1613,7 @@ class ExtraFields
if (!empty($extrafieldsobjectkey)) { if (!empty($extrafieldsobjectkey)) {
$label = $this->attributes[$extrafieldsobjectkey]['label'][$key]; $label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
$type = $this->attributes[$extrafieldsobjectkey]['type'][$key]; $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
$size = (int) $this->attributes[$extrafieldsobjectkey]['size'][$key]; $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; // Can be '255', '24,8'...
$default = $this->attributes[$extrafieldsobjectkey]['default'][$key]; $default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key]; $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key]; $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
@ -1911,7 +1911,7 @@ class ExtraFields
} elseif ($type == 'password') { } elseif ($type == 'password') {
$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1); $value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
} else { } else {
$showsize = round($size); $showsize = round((float) $size);
if ($showsize > 48) { if ($showsize > 48) {
$showsize = 48; $showsize = 48;
} }

1
htdocs/cron/card.php
View File

@ -284,6 +284,7 @@ if ($conf->use_javascript_ajax) {
print '</script>'."\n"; print '</script>'."\n";
} }
$formconfirm = '';
if ($action == 'delete') { if ($action == 'delete') {
$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1); $formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);