From 266b413139ffd9b48546fb0c21be21969f567934 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 12 Feb 2014 00:23:15 +0100
Subject: [PATCH] Fix: colspan for extrafields

---
 htdocs/core/class/commonobject.class.php | 4 ++--
 htdocs/product/fiche.php                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 869a989e55d..8f45a53e059 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2144,7 +2144,7 @@ abstract class CommonObject
 		$error=0;
 
 		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
-		
+
         if (! empty($this->array_options))
         {
             // Check parameters
@@ -2303,7 +2303,7 @@ abstract class CommonObject
 						$label = '<span class="fieldrequired">'.$label.'</span>';
 
 					$out .= '<td>'.$label.'</td>';
-					$out .='<td colspan="'.$colspan.'">';
+					$out .='<td'.($colspan?' colspan="'.$colspan.'"':'').'>';
 
 					switch($mode) {
 					case "view":
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 9193b8e103e..1ab03bb6a9b 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -800,11 +800,11 @@ else
         print '</td></tr>';
 
         // Other attributes
-        $parameters=array('colspan' => ' colspan="2"');
+        $parameters=array('colspan' => 0);
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
-        	print $object->showOptionals($extrafields,'edit');
+        	print $object->showOptionals($extrafields,'edit',$parameters);
         }
 
         // Note (private, no output on invoices, propales...)