// Merge -> revision 9221

classes/Attribute.php

@@ -44,6 +44,7 @@ class AttributeCore extends ObjectModel
 
 	protected 	$table = 'attribute';
 	protected 	$identifier = 'id_attribute';
+	protected	$image_dir = _PS_COL_IMG_DIR_;
 
 	protected	$webserviceParameters = array(
 		'objectsNodeName' => 'product_option_values',

classes/Cart.php

@@ -475,7 +475,7 @@ class CartCore extends ObjectModel
 				$row['total'] = Tools::ps_round($row['price'] * (int)($row['cart_quantity']), 2);
 			}
 
-			if (!isset($row['pai_id_image']))
+			if (!isset($row['pai_id_image']) OR $row['pai_id_image'] == 0)
 			{
 				$row2 = Db::getInstance()->getRow('
 				SELECT i.`id_image`, il.`legend`

classes/ConfigurationTest.php

@@ -55,7 +55,7 @@ class	ConfigurationTestCore
 	
 	static function test_magicquotes()
 	{
-		return !ini_get('magic_quotes_gpc');
+		return !get_magic_quotes_gpc();
 	}
 
 	static	function test_upload()

classes/Language.php

@@ -99,7 +99,8 @@ class LanguageCore extends ObjectModel
 	 * Generate traslations files
 	 *
 	 */
-	private function _generateFiles($newIso){
+	private function _generateFiles($newIso = null)
+	{
 		$iso_code = $newIso?$newIso:$this->iso_code;
 
 		if (!file_exists(_PS_TRANSLATIONS_DIR_.$iso_code))

classes/PDF.php

@@ -289,6 +289,14 @@ class PDFCore extends PDF_PageGroupCore
 		$this->SetFont(self::fontname(), '', 7);
 		$this->Cell(190, 5, ' '."\n".Tools::iconv('utf-8', self::encoding(), 'P. ').$this->GroupPageNo().' / '.$this->PageGroupAlias(), 'T', 1, 'R');
 
+		global $cookie;
+		if (Configuration::get('PS_INVOICE_FREE_TEXT', $cookie->id_lang))
+		{
+
+			$this->Cell(0, 10, utf8_decode(Configuration::get('PS_INVOICE_FREE_TEXT', $cookie->id_lang)), 0, 0, 'C', 0);
+			$this->Ln(4);
+		}
+
 		/*
 		 * Display a message for customer
 		 */

classes/Upgrader.php

@@ -31,9 +31,7 @@ class UpgraderCore
 	public $rss_version_link = 'http://www.prestashop.com/xml/upgrader.xml';
 	public $rss_md5file_link_dir = 'http://www.prestashop.com/xml/md5/';
 	/**
-	 * link contains hte url where to download the file
-	 * 
-	 * @var string 
+	 * @var boolean contains true if last version is not installed
 	 */
 	private $need_upgrade = false;
 	private $changed_files = array();
@@ -41,6 +39,9 @@ class UpgraderCore
 
 	public $version_name;
 	public $version_num;
+	/**
+	 * @var string contains hte url where to download the file
+	 */
 	public $link;
 	public $autoupgrade;
 	public $autoupgrade_module;
@@ -68,7 +69,7 @@ class UpgraderCore
 			$this->checkPSVersion();
 
 		$destPath =  realpath($dest).DIRECTORY_SEPARATOR.$filename;
-		if (@copy($this->link, $destPath) && md5_file($destPath) == $this->md5 )
+		if (@copy($this->link, $destPath))
 			return true;
 		else
 			return false;
@@ -131,13 +132,21 @@ class UpgraderCore
 			else
 			{
 				$last_version_check = @unserialize(Configuration::get('PS_LAST_VERSION'));
+				if (isset($last_version_check['name']))
 				$this->version_name = $last_version_check['name'];
+				if (isset($last_version_check['num']))
 				$this->version_num = $last_version_check['num'];
+				if (isset($last_version_check['link']))
 				$this->link = $last_version_check['link'];
+				if (isset($last_version_check['autoupgrade']))
 				$this->autoupgrade = $last_version_check['autoupgrade'];
+				if (isset($last_version_check['autoupgrade_module']))
 				$this->autoupgrade_module = $last_version_check['autoupgrade_module'];
+				if (isset($last_version_check['md5']))
 				$this->md5 = $last_version_check['md5'];
+				if (isset($last_version_check['desc']))
 				$this->desc = $last_version_check['desc'];
+				if (isset($last_version_check['changelog']))
 				$this->changelog = $last_version_check['changelog'];
 			}
 		}