Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

classes/ProductSale.php

@@ -68,7 +68,7 @@ class ProductSaleCore
 
 		$final_order_by = $order_by;
 		if (empty($order_by) || $order_by == 'position' || $order_by = 'price') $order_by = 'sales';
-		if (empty($order_way)) $order_way = 'DESC';
+		if (empty($order_way) || $order_by == 'sales') $order_way = 'DESC';
 
 		$groups = FrontController::getCurrentCustomerGroups();
 		$sql_groups = (count($groups) ? 'IN ('.implode(',', $groups).')' : '= 1');

controllers/admin/AdminCartsController.php

@@ -570,7 +570,7 @@ class AdminCartsControllerCore extends AdminController
 		if (isset($summary['gift_products']) && count($summary['gift_products']))
 			foreach ($summary['gift_products'] as &$product)
 			{
-				$product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small');
+				$product['image_link'] = $this->context->link->getImageLink($product['link_rewrite'], $product['id_image'], 'small_default');
 				if (!isset($product['attributes_small']))
 					$product['attributes_small'] = '';
 			}

install-dev/upgrade/php/update_order_messages.php

@@ -0,0 +1,74 @@
+<?php
+/*
+* 2007-2012 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+function update_order_messages()
+{
+    $step = 3000;    
+    $count_messages = Db::getInstance()->getValue('SELECT count(id_message) FROM '._DB_PREFIX_.'message');
+    $nb_loop = $start = 0;
+    if($count_messages > 0)
+        $nb_loop = ceil($count_messages / $step);
+    for($i = 0; $i < $nb_loop; $i++)
+    {
+        $sql = 'SELECT id_message, message FROM '._DB_PREFIX_.'message LIMIT '.(int)$start.', '.(int)$step;
+    	if ($messages = Db::getInstance()->executeS($sql))
+    	{   	   
+            if(is_array($messages))
+                foreach($messages as $message)
+                {
+                    $sql = 'UPDATE '._DB_PREFIX_.'message SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(br2nl($message['message']))).'\' 
+                            WHERE id_message = '.(int)$message['id_message'];
+                    $result = Db::getInstance()->execute($sql);
+                }
+            $start += ($step + 1);
+    	}
+    }
+    
+    $count_messages = Db::getInstance()->getValue('SELECT count(id_customer_message) FROM '._DB_PREFIX_.'customer_message');
+    $nb_loop = $start = 0;
+    if($count_messages > 0)
+        $nb_loop = ceil($count_messages / $step);
+    for($i = 0; $i < $nb_loop; $i++)
+    {
+        $sql = 'SELECT id_customer_message, message FROM '._DB_PREFIX_.'customer_message LIMIT '.(int)$start.', '.(int)$step;
+    	if ($messages = Db::getInstance()->executeS($sql))
+    	{    	   
+            if(is_array($messages))
+                foreach($messages as $message)
+                {
+                    $sql = 'UPDATE '._DB_PREFIX_.'customer_message SET message = \''.pSQL(Tools::htmlentitiesDecodeUTF8(str_replace('&amp;', '&', $message['message']))).'\' 
+                            WHERE id_customer_message = '.(int)$message['id_customer_message'];
+                    Db::getInstance()->execute($sql);
+                }
+            $start += ($step + 1);                         
+    	}
+    }
+}
+
+function br2nl($str)
+{   
+    return preg_replace("/<br( \/)?>/i", "\n", $str);
+}

install-dev/upgrade/php/updateordermessages.php

@@ -1,48 +0,0 @@
-<?php
-/*
-* 2007-2012 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-function updateordermessages()
-{
-	if ($messages = Db::getInstance()->executeS('SELECT id_message, message FROM '._DB_PREFIX_.'message'))
-	{
-        if(is_array($messages))
-            foreach($messages as $message)
-            {
-                $sql = 'UPDATE '._DB_PREFIX_.'message SET message = \''.pSQL(html_entity_decode($message['message'], ENT_COMPAT, 'UTF-8')).'\' WHERE id_message = '.(int)$message['id_message'];
-                Db::getInstance()->execute($sql);
-            }
-	}
-    
-	if ($messages = Db::getInstance()->executeS('SELECT id_customer_message, message FROM '._DB_PREFIX_.'customer_message'))
-	{
-        if(is_array($messages))
-            foreach($messages as $message)
-            {
-                $sql = 'UPDATE '._DB_PREFIX_.'customer_message SET message = \''.pSQL(html_entity_decode(str_replace('&amp;', '&', $message['message']), ENT_COMPAT, 'UTF-8')).'\' WHERE id_customer_message = '.(int)$message['id_customer_message'];
-                Db::getInstance()->execute($sql);
-            }
-	}    
-}

install-dev/upgrade/sql/1.5.3.0.sql

@@ -6,7 +6,7 @@ SET NAMES 'utf8';
 
 /* PHP:block_category_1521(); */;
 
-/* PHP:updateordermessages(); */;
+/* PHP:update_order_messages(); */;
 
 UPDATE `PREFIX_order_state` SET `delivery` = 0 WHERE `id_order_state` = 3;