dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jérôme Nadaud committed 2013-07-23 18:38:33 +02:00
2 parents d241013692 4aab4f88cd
commit 71271ded7f
3 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/Search.php
+2 -2
View File
@@ -102,11 +102,11 @@ class SearchCore
$string = preg_replace('/['.PREG_CLASS_SEARCH_EXCLUDE.']+/u', ' ', $string); $string = preg_replace('/['.PREG_CLASS_SEARCH_EXCLUDE.']+/u', ' ', $string);
if ($indexation) if ($indexation)
$string = preg_replace('/[._-]+/', '', $string); $string = preg_replace('/[._-]+/', ' ', $string);
else else
{ {
$string = preg_replace('/[._]+/', '', $string); $string = preg_replace('/[._]+/', '', $string);
$string = ltrim(preg_replace('/([^ ])-/', '$1', ' '.$string)); $string = ltrim(preg_replace('/([^ ])-/', '$1 ', ' '.$string));
$string = preg_replace('/[._]+/', '', $string); $string = preg_replace('/[._]+/', '', $string);
$string = preg_replace('/[^\s]-+/', '', $string); $string = preg_replace('/[^\s]-+/', '', $string);
} }
controllers/admin/AdminCustomerThreadsController.php
+1 -1
View File
@@ -401,7 +401,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
), ),
); );
//#ct == id_customer_thread #tc == token of thread <== used in the synchronization imap //#ct == id_customer_thread #tc == token of thread <== used in the synchronization imap
$contact = new Contact((int)$ct->id_contact); $contact = new Contact((int)$ct->id_contact, (int)$ct->id_lang);
if (Validate::isLoadedObject($contact)) if (Validate::isLoadedObject($contact))
{ {
$from_name = $contact->name[(int)$ct->id_lang]; $from_name = $contact->name[(int)$ct->id_lang];
controllers/admin/AdminProductsController.php
+2 -2
View File
@@ -175,12 +175,12 @@ class AdminProductsControllerCore extends AdminController
LEFT JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (image_shop.`id_image` = i.`id_image` AND image_shop.`cover` = 1 AND image_shop.id_shop = '.$id_shop.')'; LEFT JOIN `'._DB_PREFIX_.'image_shop` image_shop ON (image_shop.`id_image` = i.`id_image` AND image_shop.`cover` = 1 AND image_shop.id_shop = '.$id_shop.')';
$this->_select .= 'shop.name as shopname, '; $this->_select .= 'shop.name as shopname, ';
$this->_select .= 'MAX('.$alias_image.'.id_image) id_image, cl.name `name_category`, '.$alias.'.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, '.$alias.'.`active`, '; $this->_select .= 'MAX('.$alias_image.'.id_image) id_image, cl.name `name_category`, '.$alias.'.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, '.$alias.'.`active`';
if ($join_category) if ($join_category)
{ {
$this->_join .= ' INNER JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = a.`id_product` AND cp.`id_category` = '.(int)$this->_category->id.') '; $this->_join .= ' INNER JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = a.`id_product` AND cp.`id_category` = '.(int)$this->_category->id.') ';
$this->_select .= ' cp.`position`, '; $this->_select .= ' , cp.`position`, ';
} }
$this->_group = 'GROUP BY '.$alias.'.id_product'; $this->_group = 'GROUP BY '.$alias.'.id_product';