Merge pull request #10124 from atm-john/fix_issue_from_scrutinizer

Fix issue from scrutinizer
Dolibarr · Dec 1, 2018 · 915b1b9 · 915b1b9
2 parents 30ed180 + c6f4879
commit 915b1b9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
@@ -1017,7 +1017,6 @@ function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
         global $hookmanager;
 
         $parameters=array(
-            'object' => $object,
             'curY' => &$curY,
             'columnText' => $columnText,
             'colKey' => $colKey

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -6291,12 +6291,11 @@ function showOptionals($extrafields, $mode='view', $params=null, $keysuffix='',
 				// 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) {