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

Working : Content : fix loop giving no elements

Browse Source
This commit is contained in:
gmorel
2013-09-17 17:43:19 +02:00
parent 9c0d310441
commit c99e7a91b9
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/lib/Thelia/Core/Template/Loop/Content.php
View File

@@ -102,15 +102,16 @@ class Content extends BaseI18nLoop
if (!is_null($folder) || !is_null($folderDefault)) { if (!is_null($folder) || !is_null($folderDefault)) {
$folders = array(); $foldersIds = array();
if (!is_null($folder)) { if (!is_array($folder)) {
$folders = array_merge($folders, FolderQuery::create()->filterById($folder, Criteria::IN)->find()); $folder = array();
} }
if (!is_array($folderDefault)) {
if (!is_null($folderDefault)) { $folderDefault = array();
$folders = array_merge(FolderQuery::create()->filterById($folderDefault, Criteria::IN)->find());
} }
$foldersIds = array_merge($foldersIds, $folder, $folderDefault);
$folders =FolderQuery::create()->filterById($foldersIds, Criteria::IN)->find();
$depth = $this->getDepth(); $depth = $this->getDepth();
@@ -175,12 +176,12 @@ class Content extends BaseI18nLoop
$search->addDescendingOrderByColumn('i18n_TITLE'); $search->addDescendingOrderByColumn('i18n_TITLE');
break; break;
case "manual": case "manual":
if(null === $folder || count($folder) != 1) if(null === $foldersIds || count($foldersIds) != 1)
throw new \InvalidArgumentException('Manual order cannot be set without single folder argument'); throw new \InvalidArgumentException('Manual order cannot be set without single folder argument');
$search->orderByPosition(Criteria::ASC); $search->orderByPosition(Criteria::ASC);
break; break;
case "manual_reverse": case "manual_reverse":
if(null === $folder || count($folder) != 1) if(null === $foldersIds || count($foldersIds) != 1)
throw new \InvalidArgumentException('Manual order cannot be set without single folder argument'); throw new \InvalidArgumentException('Manual order cannot be set without single folder argument');
$search->orderByPosition(Criteria::DESC); $search->orderByPosition(Criteria::DESC);
break; break;