From 60a6c3fa9501a76b20e85ff87dcc8c5a523300ed Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 16 Mar 2012 19:16:17 +0100
Subject: [PATCH] Fix: missing fetch for get extraparams

---
 htdocs/core/ajax/extraparams.php         | 10 ++++++----
 htdocs/core/class/commonobject.class.php |  6 ++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 1c573e7c294..3a363b41997 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -61,12 +61,14 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
 	
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 	
-	$classname	= ucfirst($subelement);
-	$object		= new $classname($db);
-	$object->id	= $id;
+	$classname = ucfirst($subelement);
+	$object	= new $classname($db);
+	$object->fetch($id);
 	
 	$params[$htmlelement] = array($type => $value);
-	$result=$object->setExtraParameters($params);
+	$object->extraparams = array_merge($object->extraparams, $params);
+	
+	$result=$object->setExtraParameters();
 }
 
 ?>
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c89fe9aba22..c6c1fdfa79b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2131,13 +2131,11 @@ abstract class CommonObject
     /**
      *	Set extra parameters
      *
-     *	@param	array	$params		Extra parameters
+     *	@return	void
      */
-    function setExtraParameters($params)
+    function setExtraParameters()
     {
     	$this->db->begin();
-    	
-    	$this->extraparams = array_merge($this->extraparams, (array) $params);
     	
     	$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
     	$sql.= ' SET extraparams = "'.$this->db->escape(dol_json_encode($this->extraparams)).'"';