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

[-] BO : AdminImport, fix Group searchByName

Browse Source
This commit is contained in:
gRoussac
2013-10-11 10:23:17 +02:00
parent 075a911cee
commit 36ca7bc508
2 changed files with 9 additions and 20 deletions
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
* @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('
SELECT g.*, gl.*
FROM `'._DB_PREFIX_.'group` g
LEFT JOIN `'._DB_PREFIX_.'group_lang` gl
ON (g.`id_group` = gl.`id_group`)
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')
);
return Db::getInstance()->getRow('
SELECT g.*, gl.*
FROM `'._DB_PREFIX_.'group` g
LEFT JOIN `'._DB_PREFIX_.'group_lang` gl
ON (g.`id_group` = gl.`id_group`)
WHERE `name` LIKE \''.pSQL($query).'\'
');
}
}
controllers/admin/AdminImportController.php
+1 -1
View File
@@ -942,7 +942,7 @@ class AdminImportControllerCore extends AdminController
}
elseif (isset($category->parent) && is_string($category->parent))
{
$category_parent = Category::searchByName($default_language_id, $category->parent, true);
$category_parent = Category::searchByName($default_language_id, $category->parent);
if ($category_parent['id_category'])
{
$category->id_parent = (int)$category_parent['id_category'];