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:
Gregory Roussac
2013-01-08 09:53:12 +01:00
parent d6dbaf1113 ad38d238bc
commit 3e5e5baa8c
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcategories/blockcategories.php
+7 -1
View File
@@ -186,6 +186,9 @@ class BlockCategories extends Module
$blockCategTree = $this->getTree($resultParents, $resultIds, Configuration::get('BLOCK_CATEG_MAX_DEPTH')); $blockCategTree = $this->getTree($resultParents, $resultIds, Configuration::get('BLOCK_CATEG_MAX_DEPTH'));
unset($resultParents, $resultIds); unset($resultParents, $resultIds);
$id_category = (int)Tools::getValue('id_category');
$id_product = (int)Tools::getValue('id_product');
$isDhtml = (Configuration::get('BLOCK_CATEG_DHTML') == 1 ? true : false); $isDhtml = (Configuration::get('BLOCK_CATEG_DHTML') == 1 ? true : false);
if (Tools::isSubmit('id_category')) if (Tools::isSubmit('id_category'))
{ {
@@ -195,7 +198,7 @@ class BlockCategories extends Module
if (Tools::isSubmit('id_product')) if (Tools::isSubmit('id_product'))
{ {
if (!isset($this->context->cookie->last_visited_category) if (!isset($this->context->cookie->last_visited_category)
|| !Product::idIsOnCategoryId((int)Tools::getValue('id_product'), array('0' => array('id_category' => $this->context->cookie->last_visited_category))) || !Product::idIsOnCategoryId($id_product, array('0' => array('id_category' => $this->context->cookie->last_visited_category)))
|| !Category::inShopStatic($this->context->cookie->last_visited_category, $this->context->shop)) || !Category::inShopStatic($this->context->cookie->last_visited_category, $this->context->shop))
{ {
$product = new Product($id_product); $product = new Product($id_product);
@@ -267,6 +270,9 @@ class BlockCategories extends Module
$isDhtml = (Configuration::get('BLOCK_CATEG_DHTML') == 1 ? true : false); $isDhtml = (Configuration::get('BLOCK_CATEG_DHTML') == 1 ? true : false);
$id_category = (int)Tools::getValue('id_category');
$id_product = (int)Tools::getValue('id_product');
if (Tools::isSubmit('id_category')) if (Tools::isSubmit('id_category'))
{ {
$this->context->cookie->last_visited_category = $id_category; $this->context->cookie->last_visited_category = $id_category;
themes/default/css/rtl.css
+2
View File
@@ -0,0 +1,2 @@
* { direction: rtl !important; }
#page { text-align: right !important; }