Rename $extrafields because already used

Dolibarr · Sep 7, 2017 · 7c743eb · 7c743eb
1 parent f5e14c9
commit 7c743eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
@@ -1153,9 +1153,9 @@
 
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-											$extrafields = new ExtraFields($db);
-											$targetExtraLabels = $extrafields->fetch_name_optionals_label($object->table_element_line);
-											$lines[$i]->fetch_optionals($lines[$i]->rowid, $targetExtraLabels);
+											$targetExtraFields = new ExtraFields($db);
+											$targetExtraFieldLabels = $targetExtraFields->fetch_name_optionals_label($object->table_element_line);
+											$lines[$i]->fetch_optionals($lines[$i]->rowid, $targetExtraFieldLabels);
 											$array_options = $lines[$i]->array_options;
 										}
 

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
@@ -459,9 +459,9 @@
 	                        // Extrafields
 	                        if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
 	                        	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-	                        	$extrafields = new ExtraFields($db);
-	                        	$targetExtraLabels = $extrafields->fetch_name_optionals_label($object->table_element_line);
-	                        	$lines[$i]->fetch_optionals($lines[$i]->rowid, $targetExtraLabels);
+	                        	$targetExtraFields = new ExtraFields($db);
+	                        	$targetExtraFieldLabels = $targetExtraFields->fetch_name_optionals_label($object->table_element_line);
+	                        	$lines[$i]->fetch_optionals($lines[$i]->rowid, $targetExtraFieldLabels);
 	                        }
 	                        // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
 	                        $result = $object->addline(