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

Fix bug in Content Loop with "current_folder" params

Browse Source
This commit is contained in:
badsuricate
2013-10-18 10:52:40 +02:00
parent 3db29c9d1d
commit dea93ccb50
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,7 @@ class Content extends BaseI18nLoop
*/ */
public function exec(&$pagination) public function exec(&$pagination)
{ {
$search = ContentQuery::create(); $search = ContentQuery::create();
/* manage translations */ /* manage translations */
@@ -138,27 +139,15 @@ class Content extends BaseI18nLoop
$current_folder = $this->getCurrent_folder(); $current_folder = $this->getCurrent_folder();
if ($current_folder === true) { if ($current_folder === true) {
$search->filterByFolder( $current = ContentQuery::create()->findPk($this->request->get("content_id"));
FolderQuery::create()->filterByContent(
ContentFolderQuery::create()->filterByContentId( $search->filterByFolder($current->getFolders(), Criteria::IN);
$this->request->get("content_id"),
Criteria::EQUAL
)->find(),
Criteria::IN
)->find(),
Criteria::IN
);
} elseif ($current_folder === false) { } elseif ($current_folder === false) {
$search->filterByFolder(
FolderQuery::create()->filterByContent( $current = ContentQuery::create()->findPk($this->request->get("content_id"));
ContentFolderQuery::create()->filterByContentId(
$this->request->get("content_id"), $search->filterByFolder($current->getFolders(), Criteria::NOT_IN);
Criteria::EQUAL
)->find(),
Criteria::IN
)->find(),
Criteria::NOT_IN
);
} }
$visible = $this->getVisible(); $visible = $this->getVisible();