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:
gRoussac
2013-03-01 17:18:07 +01:00
parent e385e2d19c 8af272f6e3
commit 42bb2a506c
8 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocklayered/blocklayered.php
+4 -4
View File
@@ -523,7 +523,7 @@ class BlockLayered extends Module
$id_lang = (int)$language['id_lang'];
Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature_lang_value
VALUES ('.(int)$params['id_feature'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\',
\''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')');
\''.pSQL(Tools::getValue('meta_title_'.$id_lang), true).'\')');
}
}
@@ -539,7 +539,7 @@ class BlockLayered extends Module
$id_lang = (int)$language['id_lang'];
Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_feature_value_lang_value
VALUES ('.(int)$params['id_feature_value'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\',
\''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')');
\''.pSQL(Tools::getValue('meta_title_'.$id_lang), true).'\')');
}
}
@@ -626,7 +626,7 @@ class BlockLayered extends Module
$id_lang = (int)$language['id_lang'];
Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_lang_value
VALUES ('.(int)$params['id_attribute'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\',
\''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')');
\''.pSQL(Tools::getValue('meta_title_'.$id_lang), true).'\')');
}
}
@@ -727,7 +727,7 @@ class BlockLayered extends Module
$id_lang = (int)$language['id_lang'];
Db::getInstance()->execute('INSERT INTO '._DB_PREFIX_.'layered_indexable_attribute_group_lang_value
VALUES ('.(int)$params['id_attribute_group'].', '.$id_lang.', \''.pSQL(Tools::link_rewrite(Tools::getValue('url_name_'.$id_lang))).'\',
\''.pSQL(Tools::safeOutput(Tools::getValue('meta_title_'.$id_lang), true)).'\')');
\''.pSQL(Tools::getValue('meta_title_'.$id_lang), true).'\')');
}
}
modules/statsbestmanufacturers/statsbestmanufacturers.php
+2 -2
View File
@@ -132,8 +132,8 @@ class StatsBestManufacturers extends ModuleGrid
LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_order = od.id_order)
LEFT JOIN '._DB_PREFIX_.'currency c ON (c.id_currency = o.id_currency)
LEFT JOIN '._DB_PREFIX_.'manufacturer m ON (m.id_manufacturer = p.id_manufacturer)
WHERE '.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
AND o.invoice_date BETWEEN '.$this->getDate().'
WHERE o.invoice_date BETWEEN '.$this->getDate().'
'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o').'
AND o.valid = 1
AND m.id_manufacturer IS NOT NULL
GROUP BY p.id_manufacturer';