From 698b93cf1e754fe5419214ec2161f97ecbfa75e5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 May 2016 12:38:30 +0200
Subject: [PATCH] FIX #5179

---
 htdocs/core/class/commonobject.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5445733852e..3ad080d8a55 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4251,7 +4251,7 @@ abstract class CommonObject
 
 		if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;	// For avoid conflicts if trigger used
 
-        if (! empty($this->array_options) && !empty($this->array_options["options_$key"]))
+        if (! empty($this->array_options) && isset($this->array_options["options_".$key]))
         {
             // Check parameters
             $langs->load('admin');
@@ -4259,7 +4259,7 @@ abstract class CommonObject
             $extrafields = new ExtraFields($this->db);
             $target_extrafields=$extrafields->fetch_name_optionals_label($this->table_element);
 
-            $value=$this->array_options["options_$key"];
+            $value=$this->array_options["options_".$key];
             $attributeType  = $extrafields->attribute_type[$key];
             $attributeLabel = $extrafields->attribute_label[$key];
             $attributeParam = $extrafields->attribute_param[$key];
@@ -4273,17 +4273,17 @@ abstract class CommonObject
                     }
                     elseif ($value=='')
                     {
-                        $this->array_options["options_$key"] = null;
+                        $this->array_options["options_".$key] = null;
                     }
                     break;
                 case 'price':
-                    $this->array_options["options_$key"] = price2num($this->array_options["options_$key"]);
+                    $this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
                     break;
                 case 'date':
-                    $this->array_options["options_$key"]=$this->db->idate($this->array_options["options_$key"]);
+                    $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
                     break;
                 case 'datetime':
-                    $this->array_options["options_$key"]=$this->db->idate($this->array_options["options_$key"]);
+                    $this->array_options["options_".$key]=$this->db->idate($this->array_options["options_".$key]);
                     break;
                 case 'link':
                     $param_list=array_keys($attributeParam ['options']);
@@ -4295,13 +4295,13 @@ abstract class CommonObject
                     if ($value)
                     {
                         $object->fetch(0,$value);
-                        $this->array_options["options_$key"]=$object->id;
+                        $this->array_options["options_".$key]=$object->id;
                     }
                     break;
             }
             
             $this->db->begin();
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET $key='".$this->db->escape($this->array_options["options_$key"])."'";
+            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element."_extrafields SET ".$key."='".$this->db->escape($this->array_options["options_".$key])."'";
             $sql .= " WHERE fk_object = ".$this->id;
             $resql = $this->db->query($sql);
             if (! $resql)