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

Merge pull request #21186 from Quatadah/fix18704

Browse Source 
FIX #18704
This commit is contained in:
Laurent Destailleur 2022-06-12 12:25:34 +02:00 committed by GitHub
commit 88fc3a4d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/commonobject.class.php
View File

@ -7410,7 +7410,7 @@ abstract class CommonObject
$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]); $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
} }
$colspan = ''; $colspan = 0;
if (is_array($params) && count($params) > 0 && $display_type=='card') { if (is_array($params) && count($params) > 0 && $display_type=='card') {
if (array_key_exists('cols', $params)) { if (array_key_exists('cols', $params)) {
$colspan = $params['cols']; $colspan = $params['cols'];
@ -7423,6 +7423,7 @@ abstract class CommonObject
} }
} }
} }
$colspan = intval($colspan);
switch ($mode) { switch ($mode) {
case "view": case "view":
@ -7468,7 +7469,7 @@ abstract class CommonObject
} }
} }
$out .= $extrafields->showSeparator($key, $this, ($colspan + 1), $display_type); $out .= $extrafields->showSeparator($key, $this, ($colspan ? $colspan + 1 : 2), $display_type);
} else { } else {
$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : ''); $class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
$csstyle = ''; $csstyle = '';
@ -7489,7 +7490,7 @@ abstract class CommonObject
$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id); $html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
if ($display_type=='card') { if ($display_type=='card') {
if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {
$colspan = '0'; $colspan = 0;
} }
if ($action == 'selectlines') { if ($action == 'selectlines') {