From f4bab2f6de0164b486cafc478ee8c58d9c599a4a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 27 Feb 2012 08:47:25 +0100
Subject: [PATCH] Fix: avoid warning and deprecated variable

---
 htdocs/compta/facture/class/facture.class.php | 14 +++++++-------
 htdocs/core/class/conf.class.php              |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index d551171758b..8a1cb98c4b7 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -838,7 +838,7 @@ class Facture extends CommonObject
         $sql.= ' l.rang, l.special_code,';
         $sql.= ' l.date_start as date_start, l.date_end as date_end,';
         $sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_export_compta,';
-        $sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as label, p.description as product_desc';
+        $sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
         $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
         $sql.= ' WHERE l.fk_facture = '.$this->id;
@@ -856,12 +856,12 @@ class Facture extends CommonObject
                 $line = new FactureLigne($this->db);
 
                 $line->rowid	        = $objp->rowid;
-                $line->desc             = $objp->description;     // Description line
-                $line->product_type     = $objp->product_type;	// Type of line
-                $line->product_ref      = $objp->product_ref;     // Ref product
-                $line->libelle          = $objp->label;           // Label product
-                $line->product_label	= $objp->product_label;
-                $line->product_desc     = $objp->product_desc;    // Description product
+                $line->desc             = $objp->description;		// Description line
+                $line->product_type     = $objp->product_type;		// Type of line
+                $line->product_ref      = $objp->product_ref;		// Ref product
+                $line->libelle          = $objp->product_label;		// TODO deprecated
+                $line->product_label	= $objp->product_label;		// Label product
+                $line->product_desc     = $objp->product_desc;		// Description product
                 $line->fk_product_type  = $objp->fk_product_type;	// Type of product
                 $line->qty              = $objp->qty;
                 $line->subprice         = $objp->subprice;
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 6fb47d6100f..84b49901ce8 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -161,7 +161,7 @@ class Conf
 							$partname = strtolower($reg[2]);
 							$varname = $partname.'_modules';
 							if (! is_array($this->$varname)) { $this->$varname = array(); }
-							$arrValue = unserialize($value);
+							$arrValue = @unserialize($value);
 							if (is_array($arrValue) && ! empty($arrValue)) $value = $arrValue;
 							else $value = ($value == 1 ? '/'.$modulename.'/core/'.$partname.'/' : $value);
 							$this->$varname = array_merge($this->$varname, array($modulename => $value));