TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'admin' of github.com:thelia/thelia into admin

Browse Source
This commit is contained in:
Manuel Raynaud
2013-06-21 14:28:19 +02:00
parent c246d33a1e f2beba931b
commit fc00bc9044
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Core/Template/Loop/Category.php
View File

@@ -28,6 +28,7 @@ namespace Thelia\Core\Template\Loop;
use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Log\Tlog;
use Thelia\Model\CategoryQuery;
/**
@@ -101,7 +102,7 @@ class Category extends BaseLoop {
$search = CategoryQuery::create();
if (!is_null($this->id)) {
$search->filterById($this->id, \Criteria::IN);
$search->filterById(explode(',', $this->id), \Criteria::IN);
}
if(!is_null($this->parent)) {
@@ -110,7 +111,7 @@ class Category extends BaseLoop {
if($this->current == 1) {
$search->filterById($this->request->get("category_id"));
} else if ($this->current == 0) {
} else if (null !== $this->current && $this->current == 0) {
$search->filterById($this->request->get("category_id"), \Criteria::NOT_IN);
}