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

[-] Core: Fix #PSCFV-8012 attribute_url is sometimes null but also sometimes empty...

Browse Source
This commit is contained in:
Rémi Gaillard
2013-02-27 16:16:02 +01:00
parent c39882dcd5
commit 8a0474320f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+4 -4
View File
@@ -4736,7 +4736,7 @@ class ProductCore extends ObjectModel
'.Shop::addSqlAssociation('product_attribute', 'pa').' '.Shop::addSqlAssociation('product_attribute', 'pa').'
LEFT JOIN `'._DB_PREFIX_.'layered_indexable_attribute_lang_value` la LEFT JOIN `'._DB_PREFIX_.'layered_indexable_attribute_lang_value` la
ON (la.`id_attribute` = a.`id_attribute` AND la.`id_lang` = '.(int)Context::getContext()->language->id.') ON (la.`id_attribute` = a.`id_attribute` AND la.`id_lang` = '.(int)Context::getContext()->language->id.')
WHERE la.`url_name` IS NOT NULL WHERE la.`url_name` IS NOT NULL AND la.`url_name` != \'\'
AND pa.`id_product` = '.(int)$id_product); AND pa.`id_product` = '.(int)$id_product);
if (!empty($nb_custom_values)) if (!empty($nb_custom_values))
@@ -4753,7 +4753,7 @@ class ProductCore extends ObjectModel
ON (a.`id_attribute_group` = g.`id_attribute_group`) ON (a.`id_attribute_group` = g.`id_attribute_group`)
WHERE a.`id_attribute` = '.(int)$attribute['id_attribute'].' WHERE a.`id_attribute` = '.(int)$attribute['id_attribute'].'
AND g.`id_lang` = '.(int)Context::getContext()->language->id.' AND g.`id_lang` = '.(int)Context::getContext()->language->id.'
AND g.`url_name` IS NOT NULL'); AND g.`url_name` IS NOT NULL AND g.`url_name` != \'\'');
if (empty($group)) if (empty($group))
{ {
$group = Db::getInstance()->executeS(' $group = Db::getInstance()->executeS('
@@ -4842,7 +4842,7 @@ class ProductCore extends ObjectModel
'.Shop::addSqlAssociation('product_attribute', 'pa').' '.Shop::addSqlAssociation('product_attribute', 'pa').'
LEFT JOIN `'._DB_PREFIX_.'layered_indexable_attribute_lang_value` la LEFT JOIN `'._DB_PREFIX_.'layered_indexable_attribute_lang_value` la
ON (la.`id_attribute` = a.`id_attribute` AND la.`id_lang` = '.(int)Context::getContext()->language->id.') ON (la.`id_attribute` = a.`id_attribute` AND la.`id_lang` = '.(int)Context::getContext()->language->id.')
WHERE la.`url_name` IS NOT NULL WHERE la.`url_name` IS NOT NULL AND la.`url_name` != \'\'
AND pa.`id_product` = '.(int)$id_product); AND pa.`id_product` = '.(int)$id_product);
if (!empty($nb_custom_values)) if (!empty($nb_custom_values))
@@ -4859,7 +4859,7 @@ class ProductCore extends ObjectModel
ON (a.`id_attribute_group` = g.`id_attribute_group`) ON (a.`id_attribute_group` = g.`id_attribute_group`)
WHERE a.`id_attribute` = '.(int)$attribute['id_attribute'].' WHERE a.`id_attribute` = '.(int)$attribute['id_attribute'].'
AND g.`id_lang` = '.(int)Context::getContext()->language->id.' AND g.`id_lang` = '.(int)Context::getContext()->language->id.'
AND g.`url_name` IS NOT NULL'); AND g.`url_name` IS NOT NULL AND g.`url_name` != \'\'');
if (empty($group)) if (empty($group))
{ {
$group = Db::getInstance()->executeS(' $group = Db::getInstance()->executeS('
controllers/admin/AdminModulesController.php
+1
View File
@@ -220,6 +220,7 @@ class AdminModulesControllerCore extends AdminController
{ {
$this->context->cookie->username_addons = ''; $this->context->cookie->username_addons = '';
$this->context->cookie->password_addons = ''; $this->context->cookie->password_addons = '';
$this->context->cookie->write();
die('OK'); die('OK');
} }