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

Merge pull request #10124 from atm-john/fix_issue_from_scrutinizer

Browse Source 
Fix issue from scrutinizer
This commit is contained in:
Laurent Destailleur 2018-12-01 14:49:14 +01:00 committed by GitHub
commit 915b1b9528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/commondocgenerator.class.php
View File

@ -1017,7 +1017,6 @@ abstract class CommonDocGenerator
global $hookmanager;
$parameters=array(
'object' => $object,
'curY' => &$curY,
'columnText' => $columnText,
'colKey' => $colKey

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

@ -6291,12 +6291,11 @@ abstract class CommonObject
// Load language if required
if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
$colspan='3';
if (is_array($params) && count($params)>0) {
if (array_key_exists('colspan',$params)) {
$colspan=$params['colspan'];
}
}else {
$colspan='3';
}
switch($mode) {