From 4346d9e57c8f1fe7339e8bcd3cd2c7fc8ec61828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Gaulu=C3=A9?= <edouard@e-gaulue.com>
Date: Mon, 6 May 2013 00:32:16 +0200
Subject: [PATCH 01/13] [*] FO : AuthController can now have its own template

---
 controllers/front/AuthController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index f5b8563b4..8eec13284 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -139,6 +139,9 @@ class AuthControllerCore extends FrontController
 				'HOOK_CREATE_ACCOUNT_TOP' => Hook::exec('displayCustomerAccountFormTop')
 			));
 		
+		// Just set $this->template value here in case it's used by Ajax
+		$this->setTemplate(_PS_THEME_DIR_.'authentication.tpl');
+
 		if ($this->ajax)
 		{
 			// Call a hook to display more information on form
@@ -150,12 +153,11 @@ class AuthControllerCore extends FrontController
 			$return = array(
 				'hasError' => !empty($this->errors),
 				'errors' => $this->errors,
-				'page' => $this->context->smarty->fetch(_PS_THEME_DIR_.'authentication.tpl'),
+				'page' => $this->context->smarty->fetch($this->template),
 				'token' => Tools::getToken(false)
 			);
 			die(Tools::jsonEncode($return));
 		}
-		$this->setTemplate(_PS_THEME_DIR_.'authentication.tpl');
 	}
 
 	/**

From 448b8bad023ad9b8b5b15c44767d86d67e2105c4 Mon Sep 17 00:00:00 2001
From: AntonLejon <anton@antonpersson.se>
Date: Mon, 6 May 2013 12:14:11 +0300
Subject: [PATCH 02/13] [*] MO: blockcart animation optimization

The animated element would not be removed upon the animation being finished. This made the site slow and unresponsive if the animated image was heavy (eg. a transparent png) and added to cart many times without reloading the page. This addition makes the animation behave as expected also when performing it multiple times.
---
 modules/blockcart/ajax-cart.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index c42dc72cf..8641931c5 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -232,6 +232,7 @@ var ajaxCart = {
 					.animate({ 'width': $element.attr('width')*0.66, 'height': $element.attr('height')*0.66, 'opacity': 0.2, 'top': cartBlockOffset.top + 30, 'left': cartBlockOffset.left + 15 }, 1000)
 					.fadeOut(100, function() {
 						ajaxCart.updateCartInformation(jsonData, addedFromProductPage);
+						$(this).remove();
 					});
 				}
 				else

From 83a1ea548812abbc89d523e56aa56391a8e2f0ae Mon Sep 17 00:00:00 2001
From: AntonLejon <anton@antonpersson.se>
Date: Thu, 9 May 2013 00:53:06 +0300
Subject: [PATCH 03/13] [-] MO: blockcart ajax cart product insert missing html
 class

Added the same HTML class as the other product names have in the ajax cart. Perhaps it would be nice to add an added_from_ajax as well in case you would want to differ between the newly added items and previously added ones?
Another potential issue is on line 445 where there is no space after the insert. If Prestashop is set to minify the normal page, this is correct, otherwise there will be a space missing.
---
 modules/blockcart/ajax-cart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index c42dc72cf..073d95705 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -443,7 +443,7 @@ var ajaxCart = {
 					var content =  '<dt class="hidden" id="cart_block_product_' + domIdProduct + '">';
 					content += '<span class="quantity-formated"><span class="quantity">' + this.quantity + '</span>x</span>';
 					var name = (this.name.length > 12 ? this.name.substring(0, 10) + '...' : this.name);
-					content += '<a href="' + this.link + '" title="' + this.name + '">' + name + '</a>';
+					content += '<a href="' + this.link + '" title="' + this.name + '" class="cart_block_product_name">' + name + '</a>';
 					
 					if (parseFloat(this.price_float) > 0)
 						content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseUri + '?controller=cart&amp;delete=1&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';

From 0abe3b31939039696bd0c056941db8f7fa89422d Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 21 May 2013 13:03:41 +0300
Subject: [PATCH 04/13] [*] Class: Module / Use method instead of SQL query

---
 classes/module/Module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 2877c1bad..080ae4865 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -215,7 +215,7 @@ abstract class ModuleCore
 				}
 
 		// Check if module is installed
-		$result = Db::getInstance()->getRow('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->name).'\'');
+		$result = Module::isInstalled($this->name);
 		if ($result)
 		{
 			$this->_errors[] = $this->l('This module has already been installed.');

From 446abf7e3f7fc4bda5994b563100942d3a94cab6 Mon Sep 17 00:00:00 2001
From: PrestaEdit <j.danse@prestaedit.com>
Date: Tue, 21 May 2013 13:11:41 +0200
Subject: [PATCH 05/13] // use getModuleIdByName()

---
 classes/module/Module.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/module/Module.php b/classes/module/Module.php
index 080ae4865..fb70d9075 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1543,7 +1543,7 @@ abstract class ModuleCore
 	{
 		if (!Cache::isStored('Module::isInstalled'.$module_name))
 		{
-			$id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($module_name).'\'');
+			$id_module = Module::getModuleIdByName($module_name);
 			Cache::store('Module::isInstalled'.$module_name, (bool)$id_module);
 		}
 		return Cache::retrieve('Module::isInstalled'.$module_name);
@@ -1554,7 +1554,7 @@ abstract class ModuleCore
 		if (!Cache::isStored('Module::isEnabled'.$module_name))
 		{
 			$active = false;
-			$id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($module_name).'\'');
+			$id_module = Module::getModuleIdByName($module_name);
 			if (Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module_shop` WHERE `id_module` = '.(int)$id_module.' AND `id_shop` = '.(int)Context::getContext()->shop->id))
 				$active = true;
 			Cache::store('Module::isEnabled'.$module_name, (bool)$active);

From 5b250dbe8d103029e5a9d8df650992f38edb93c2 Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Wed, 22 May 2013 11:11:37 +0200
Subject: [PATCH 06/13] // parse error

---
 controllers/front/ContactController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/front/ContactController.php b/controllers/front/ContactController.php
index 82c2345a9..8098ad0ee 100644
--- a/controllers/front/ContactController.php
+++ b/controllers/front/ContactController.php
@@ -281,7 +281,7 @@ class ContactControllerCore extends FrontController
 				$tmp = $order->getProducts();
 				foreach ($tmp as $key => $val)
 					$products[$row['id_order']][$val['product_id']] = array('value' => $val['product_id'], 'label' => $val['product_name']);
-				$orders[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0],null , 'selected' => (int)Tools::getValue('id_order') == $order->id);
+				$orders[] = array('value' => $order->id, 'label' => $order->getUniqReference().' - '.Tools::displayDate($date[0],null) , 'selected' => (int)Tools::getValue('id_order') == $order->id);
 			}
 
 			$this->context->smarty->assign('orderList', $orders);

From 487c567224278fa1aab150eeb24aa4296ddf3a95 Mon Sep 17 00:00:00 2001
From: vAugagneur <fistou@me.com>
Date: Wed, 22 May 2013 14:38:39 +0200
Subject: [PATCH 07/13] //small fix

---
 controllers/admin/AdminCustomersController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index 67295f8f2..621e9b765 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -669,7 +669,7 @@ class AdminCustomersControllerCore extends AdminController
 			'count_better_customers' => $count_better_customers,
 			'shop_is_feature_active' => Shop::isFeatureActive(),
 			'name_shop' => $shop->name,
-			'customer_birthday' => Tools::displayDate($customer->birthday, $this->default_form_language),
+			'customer_birthday' => Tools::displayDate($customer->birthday),
 			'last_update' => Tools::displayDate($customer->date_upd,null , true),
 			'customer_exists' => Customer::customerExists($customer->email),
 			'id_lang' => $customer->id_lang,

From de945adf79967d970a8abd717e299eb0efb62dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 22 May 2013 15:46:30 +0200
Subject: [PATCH 08/13] [*] MO: Add smarty cache on blocksupplier and
 blockmanufacturer

---
 install-dev/upgrade/sql/1.5.5.0.sql           |  8 ++-
 .../blockmanufacturer/blockmanufacturer.php   | 40 +++++++++++----
 modules/blocksupplier/blocksupplier.php       | 49 +++++++++++++------
 3 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/install-dev/upgrade/sql/1.5.5.0.sql b/install-dev/upgrade/sql/1.5.5.0.sql
index 11dcb29b8..e43bee7e7 100644
--- a/install-dev/upgrade/sql/1.5.5.0.sql
+++ b/install-dev/upgrade/sql/1.5.5.0.sql
@@ -7,4 +7,10 @@ INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VAL
 ALTER TABLE `PREFIX_webservice_account` CHANGE `class_name` `class_name` VARCHAR(64) NOT NULL DEFAULT 'WebserviceRequest',
 CHANGE `module_name` `module_name` VARCHAR(64) NULL DEFAULT NULL;
 
-/* PHP:add_module_to_hook(blockcart, actionCartListOverride); */;
\ No newline at end of file
+/* PHP:add_module_to_hook(blockcart, actionCartListOverride); */;
+/* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerDeleteAfter); */;
+/* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerAddAfter); */;
+/* PHP:add_module_to_hook(blockmanufacturer, actionObjectManufacturerUpdateAfter); */;
+/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierDeleteAfter); */;
+/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierAddAfter); */;
+/* PHP:add_module_to_hook(blocksupplier, actionObjectSupplierUpdateAfter); */;
diff --git a/modules/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php
index 9f760c35a..2c07dc54e 100644
--- a/modules/blockmanufacturer/blockmanufacturer.php
+++ b/modules/blockmanufacturer/blockmanufacturer.php
@@ -48,19 +48,25 @@ class BlockManufacturer extends Module
 		Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT', true);
 		Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT_NB', 5);
 		Configuration::updateValue('MANUFACTURER_DISPLAY_FORM', true);
-        return parent::install() && $this->registerHook('leftColumn') && $this->registerHook('header');
+      return parent::install() &&
+			$this->registerHook('leftColumn') && 
+			$this->registerHook('header') &&
+			$this->registerHook('actionObjectManufacturerDeleteAfter') &&
+			$this->registerHook('actionObjectManufacturerAddAfter') &&
+			$this->registerHook('actionObjectManufacturerUpdateAfter');
     }
 
 	public function hookLeftColumn($params)
 	{
-		$this->smarty->assign(array(
-			'manufacturers' => Manufacturer::getManufacturers(),
-			'text_list' => Configuration::get('MANUFACTURER_DISPLAY_TEXT'),
-			'text_list_nb' => Configuration::get('MANUFACTURER_DISPLAY_TEXT_NB'),
-			'form_list' => Configuration::get('MANUFACTURER_DISPLAY_FORM'),
-			'display_link_manufacturer' => Configuration::get('PS_DISPLAY_SUPPLIERS'),
-		));
-		return $this->display(__FILE__, 'blockmanufacturer.tpl');
+		if (!$this->isCached('blockmanufacturer.tpl', $this->getCacheId()))
+			$this->smarty->assign(array(
+				'manufacturers' => Manufacturer::getManufacturers(),
+				'text_list' => Configuration::get('MANUFACTURER_DISPLAY_TEXT'),
+				'text_list_nb' => Configuration::get('MANUFACTURER_DISPLAY_TEXT_NB'),
+				'form_list' => Configuration::get('MANUFACTURER_DISPLAY_FORM'),
+				'display_link_manufacturer' => Configuration::get('PS_DISPLAY_SUPPLIERS'),
+			));
+		return $this->display(__FILE__, 'blockmanufacturer.tpl', $this->getCacheId());
 	}
 
 	public function hookRightColumn($params)
@@ -85,6 +91,7 @@ class BlockManufacturer extends Module
 				Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT', $text_list);
 				Configuration::updateValue('MANUFACTURER_DISPLAY_TEXT_NB', $text_nb);
 				Configuration::updateValue('MANUFACTURER_DISPLAY_FORM', $form_list);
+				$this->_clearCache('blockmanufacturer.tpl');
 			}
 			if (isset($errors) && count($errors))
 				$output .= $this->displayError(implode('<br />', $errors));
@@ -126,4 +133,19 @@ class BlockManufacturer extends Module
 	{
 		$this->context->controller->addCSS(($this->_path).'blockmanufacturer.css', 'all');
 	}
+	
+	public function hookActionObjectManufacturerUpdateAfter($params)
+	{
+		$this->_clearCache('blockmanufacturer.tpl');
+	}
+
+	public function hookActionObjectManufacturerAddAfter($params)
+	{
+		$this->_clearCache('blockmanufacturer.tpl');
+	}
+
+	public function hookActionObjectManufacturerDeleteAfter($params)
+	{
+		$this->_clearCache('blockmanufacturer.tpl');
+	}
 }
diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php
index e900db6f2..694ddd365 100644
--- a/modules/blocksupplier/blocksupplier.php
+++ b/modules/blocksupplier/blocksupplier.php
@@ -47,9 +47,12 @@ class BlockSupplier extends Module
 	{
 		if (!parent::install())
 			return false;
-		if (!$this->registerHook('displayLeftColumn'))
-			return false;
-		if (!$this->registerHook('displayHeader'))
+		if (!$this->registerHook('displayLeftColumn') ||
+				!$this->registerHook('displayHeader') ||
+				!$this->registerHook('actionObjectSupplierDeleteAfter') ||
+				!$this->registerHook('actionObjectSupplierAddAfter') ||
+				!$this->registerHook('actionObjectSupplierUpdateAfter')
+			)
 			return false;
 		Configuration::updateValue('SUPPLIER_DISPLAY_TEXT', true);
 		Configuration::updateValue('SUPPLIER_DISPLAY_TEXT_NB', 5);
@@ -73,16 +76,16 @@ class BlockSupplier extends Module
 	function hookDisplayLeftColumn($params)
 	{
 		$id_lang = (int)Context::getContext()->language->id;
-
-		$this->smarty->assign(array(
-			'suppliers' => Supplier::getSuppliers(false, $id_lang),
-			'link' => $this->context->link,
-			'text_list' => Configuration::get('SUPPLIER_DISPLAY_TEXT'),
-			'text_list_nb' => Configuration::get('SUPPLIER_DISPLAY_TEXT_NB'),
-			'form_list' => Configuration::get('SUPPLIER_DISPLAY_FORM'),
-			'display_link_supplier' => Configuration::get('PS_DISPLAY_SUPPLIERS')
-		));
-		return $this->display(__FILE__, 'blocksupplier.tpl');
+		if (!$this->isCached('blocksupplier.tpl', $this->getCacheId()))
+			$this->smarty->assign(array(
+				'suppliers' => Supplier::getSuppliers(false, $id_lang),
+				'link' => $this->context->link,
+				'text_list' => Configuration::get('SUPPLIER_DISPLAY_TEXT'),
+				'text_list_nb' => Configuration::get('SUPPLIER_DISPLAY_TEXT_NB'),
+				'form_list' => Configuration::get('SUPPLIER_DISPLAY_FORM'),
+				'display_link_supplier' => Configuration::get('PS_DISPLAY_SUPPLIERS')
+			));
+		return $this->display(__FILE__, 'blocksupplier.tpl', $this->getCacheId());
 	}
 
 	function getContent()
@@ -102,6 +105,7 @@ class BlockSupplier extends Module
 				Configuration::updateValue('SUPPLIER_DISPLAY_TEXT', $text_list);
 				Configuration::updateValue('SUPPLIER_DISPLAY_TEXT_NB', $text_nb);
 				Configuration::updateValue('SUPPLIER_DISPLAY_FORM', $form_list);
+				$this->_clearCache('blocksupplier.tpl');
 			}
 			if (isset($errors) AND sizeof($errors))
 				$output .= $this->displayError(implode('<br />', $errors));
@@ -139,14 +143,29 @@ class BlockSupplier extends Module
 		return $output;
 	}
 
-	function hookDisplayRightColumn($params)
+	public function hookDisplayRightColumn($params)
 	{
 		return $this->hookDisplayLeftColumn($params);
 	}
 
-	function hookDisplayHeader($params)
+	public function hookDisplayHeader($params)
 	{
 		$this->context->controller->addCSS(($this->_path).'blocksupplier.css', 'all');
 	}
+	
+	public function hookActionObjectSupplierUpdateAfter($params)
+	{
+		$this->_clearCache('blocksupplier.tpl');
+	}
+
+	public function hookActionObjectSupplierAddAfter($params)
+	{
+		$this->_clearCache('blocksupplier.tpl');
+	}
+
+	public function hookActionObjectSupplierDeleteAfter($params)
+	{
+		$this->_clearCache('blocksupplier.tpl');
+	}
 }
 

From 0b503a0c8b2181db9888d99dfea16c6aca2d9721 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 22 May 2013 16:54:34 +0200
Subject: [PATCH 09/13] // Inverted 2 steps in the installer

---
 install-dev/classes/controllerHttp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php
index 8063ab9af..33c6f9d97 100644
--- a/install-dev/classes/controllerHttp.php
+++ b/install-dev/classes/controllerHttp.php
@@ -29,7 +29,7 @@ abstract class InstallControllerHttp
 	/**
 	 * @var array List of installer steps
 	 */
-	protected static $steps = array('welcome', 'license', 'system', 'database', 'configure', 'process');
+	protected static $steps = array('welcome', 'license', 'system', 'configure', 'database', 'process');
 
 	protected static $instances = array();
 

From c6ab6005f5cd2117499db10e486f24917d7fffed Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 10:50:22 +0200
Subject: [PATCH 10/13] // Added error reporting level in dev mode

---
 config/defines.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/defines.inc.php b/config/defines.inc.php
index 8ce70b580..ab72ff105 100755
--- a/config/defines.inc.php
+++ b/config/defines.inc.php
@@ -28,7 +28,8 @@
 define('_PS_MODE_DEV_', true);
 if (_PS_MODE_DEV_)
 {
-	@ini_set('display_errors', 'on');	
+	@ini_set('display_errors', 'on');
+	@error_reporting(E_ALL | E_STRICT);
 	define('_PS_DEBUG_SQL_', true);
 	/* Compatibility warning */
 	define('_PS_DISPLAY_COMPATIBILITY_WARNING_', true);

From 9e7d2ac9c7f92f58d71954150f1c9845fcb42c5a Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 12:13:28 +0200
Subject: [PATCH 11/13] [-] Core : fixed URL regexp #PSCFV-8986

---
 classes/Validate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Validate.php b/classes/Validate.php
index 6af8d92c2..9d43e805f 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -724,7 +724,7 @@ class ValidateCore
 	 */
 	public static function isTrackingNumber($tracking_number)
 	{
-		return preg_match('/^[~:#,%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $tracking_number);
+		return preg_match('/^[~:#,%&_=\(\)\[\]\.\? \+\-@\/a-zA-Z0-9]+$/', $tracking_number);
 	}
 
 	/**
@@ -747,7 +747,7 @@ class ValidateCore
 	public static function isAbsoluteUrl($url)
 	{
 		if (!empty($url))
-			return preg_match('/^https?:\/\/[,:#%&_=\(\)\.\? \+\-@\/a-zA-Z0-9]+$/', $url);
+			return preg_match('/^https?:\/\/[~:#,%&_=\(\)\[\]\.\? \+\-@\/a-zA-Z0-9]+$/', $url);
 		return true;
 	}
 

From affca315589c60b0e8d2d007da3706da81f464ab Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 14:11:13 +0200
Subject: [PATCH 12/13] [-] IN : updated support phone number and website in
 the installer

---
 install-dev/langs/br/install.php | 2 +-
 install-dev/langs/de/install.php | 1 +
 install-dev/langs/en/install.php | 2 +-
 install-dev/langs/es/install.php | 1 +
 install-dev/langs/it/install.php | 1 +
 install-dev/langs/pl/install.php | 4 ++++
 install-dev/langs/ru/install.php | 4 ++++
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/install-dev/langs/br/install.php b/install-dev/langs/br/install.php
index 104f2a514..e379bec88 100644
--- a/install-dev/langs/br/install.php
+++ b/install-dev/langs/br/install.php
@@ -2,7 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+1 888.947.6543',
-		'support' => 'http://support.prestashop.com/en/',
+		'support' => 'https://www.prestashop.com/pt/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Escolha seu idioma',
diff --git a/install-dev/langs/de/install.php b/install-dev/langs/de/install.php
index fedcb2247..b09b8ac8b 100644
--- a/install-dev/langs/de/install.php
+++ b/install-dev/langs/de/install.php
@@ -2,6 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/de/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Sprachauswahl',
diff --git a/install-dev/langs/en/install.php b/install-dev/langs/en/install.php
index ee296298a..cd29befe8 100644
--- a/install-dev/langs/en/install.php
+++ b/install-dev/langs/en/install.php
@@ -6,7 +6,7 @@ return array(
 		'documentation_upgrade' => 'http://docs.prestashop.com/display/PS15/Updating+PrestaShop',
 		'forum' => 'http://www.prestashop.com/forums/',
 		'blog' => 'http://www.prestashop.com/blog/',
-		'support' => 'http://support.prestashop.com/en/',
+		'support' => 'https://www.prestashop.com/en/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Choose your language',
diff --git a/install-dev/langs/es/install.php b/install-dev/langs/es/install.php
index e9fb6d41c..78401e6cb 100644
--- a/install-dev/langs/es/install.php
+++ b/install-dev/langs/es/install.php
@@ -2,6 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+1 (888) 947-6543',
+		'support' => 'https://www.prestashop.com/es/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Elegir el idioma',
diff --git a/install-dev/langs/it/install.php b/install-dev/langs/it/install.php
index 77e6eb468..47bccfb0e 100644
--- a/install-dev/langs/it/install.php
+++ b/install-dev/langs/it/install.php
@@ -2,6 +2,7 @@
 return array(
 	'informations' => array(
 		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/it/support',
 	),
 	'translations' => array(
 		'menu_welcome' => 'Scelta della lingua',
diff --git a/install-dev/langs/pl/install.php b/install-dev/langs/pl/install.php
index d32708c8d..3197cf69b 100644
--- a/install-dev/langs/pl/install.php
+++ b/install-dev/langs/pl/install.php
@@ -1,5 +1,9 @@
 <?php
 return array(
+	'informations' => array(
+		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/pl/wsparcie-techniczne',
+	),
 	'translations' => array(
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'Wystąpił błąd SQL w rekordzie <i>%1$s</i>: <i>%2$s</i>',
 		'Cannot create image "%1$s" for entity "%2$s"' => 'Nie można utworzyć obrazu "%1$s" dla rekordu "%2$s"',
diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index eefaef775..46a46d561 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -1,5 +1,9 @@
 <?php
 return array(
+	'informations' => array(
+		'phone' => '+33 (0)1.40.18.30.04',
+		'support' => 'https://www.prestashop.com/en/support',
+	),
 	'translations' => array(
 		'An SQL error occured for entity <i>%1$s</i>: <i>%2$s</i>' => 'В SQL произошла ошибка для значения <i>%1$s</i>: <i>%2$s</i>',
 		'Cannot create image "%1$s" for entity "%2$s"' => 'Невозможно создать изображение  "%1$s" для значения "%2$s"',

From 36acfc1227ea5f27400f7859442f97fdb6711bfc Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 23 May 2013 14:29:40 +0200
Subject: [PATCH 13/13] // Updated russian translation of the installer

---
 install-dev/langs/ru/install.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-dev/langs/ru/install.php b/install-dev/langs/ru/install.php
index 46a46d561..1302da03d 100644
--- a/install-dev/langs/ru/install.php
+++ b/install-dev/langs/ru/install.php
@@ -187,7 +187,7 @@ return array(
 		'menu_license' => 'Лицензионное соглашение',
 		'PrestaShop core is released under the OSL 3.0 while PrestaShop modules and themes are released under the AFL 3.0.' => 'Ядро PrestaShop разработано на  OSL 3.0, а модули и шаблоны PrestaShop разработаны на AFL 3.0.',
 		'I agree to the above terms and conditions.' => 'Я принимаю правила и условия.',
-		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Внесите свой вклад в улучшение программного обеспечения, отравив анонимное сообщене о Вашей конфгурации.',
+		'I agree to participate in improving the solution by sending anonymous information about my configuration.' => 'Внесите свой вклад в улучшение программного обеспечения, отправив анонимное сообщение о Вашей конфигурации.',
 		'PHP 5.1.2 or later is not enabled' => 'PHP 5.1.2 или более поздняя версия не активирована',
 		'Cannot upload files' => 'Невозможно загрузить файлы',
 		'Cannot create new files and folders' => 'Невозможно создать новые файлы и папки',