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

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Fabio Chelly committed 2013-10-11 10:51:50 +02:00
2 parents d1a7ff50d5 7b02da5fdf
commit 5c66ed4791
1 file changed
+8 -19
Download Patch File Download Diff File Expand all files Collapse all files
classes/Group.php
+8 -19
View File
@@ -325,25 +325,14 @@ class GroupCore extends ObjectModel
* @param boolean $unrestricted allows search without lang and includes first group and exact match * @param boolean $unrestricted allows search without lang and includes first group and exact match
* @return array Corresponding groupes * @return array Corresponding groupes
*/ */
public static function searchByName($id_lang, $query, $unrestricted = false) public static function searchByName($id_lang, $query)
{ {
if ($unrestricted === true) return Db::getInstance()->getRow('
return Db::getInstance()->getRow(' SELECT g.*, gl.*
SELECT g.*, gl.* FROM `'._DB_PREFIX_.'group` g
FROM `'._DB_PREFIX_.'group` g LEFT JOIN `'._DB_PREFIX_.'group_lang` gl
LEFT JOIN `'._DB_PREFIX_.'group_lang` gl ON (g.`id_group` = gl.`id_group`)
ON (g.`id_group` = gl.`id_group`) WHERE `name` LIKE \''.pSQL($query).'\'
WHERE `name` LIKE \''.pSQL($query).'\' ');
');
else
return Db::getInstance()->executeS('
SELECT g.*, gl.*
FROM `'._DB_PREFIX_.'group` g
LEFT JOIN `'._DB_PREFIX_.'group_lang` gl
ON (g.`id_group` = gl.`id_group`
AND `id_lang` = '.(int)$id_lang.')
WHERE `name` LIKE \'%'.pSQL($query).'%\'
AND g.`id_group` != '.(int)Configuration::get('PS_HOME_CATEGORY')
);
} }
} }