diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index d429d96ccac..e3350dbe14a 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -1017,7 +1017,6 @@ abstract class CommonDocGenerator 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 index 307923e9bef..0e4bee78afb 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -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) {