mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-02-12 03:26:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix: ProfileStreamQuery:includeContributions sets wrong default value.

Browse Source
This commit is contained in:
buddh4 2020-07-13 18:26:18 +02:00
parent c81d52e9a3
commit 2279274544
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protected/humhub/modules/stream/models/filters/PinnedContentStreamFilter.php
View File

@ -45,16 +45,16 @@ class PinnedContentStreamFilter extends StreamQueryFilter
// Get number of pinned contents
$pinnedQuery = clone $this->query;
$pinnedQuery->andWhere(['AND', ['content.pinned' => 1], ['content.contentcontainer_id' => $this->container->contentcontainer_id]]);
$pinnedContent = $pinnedQuery->select('content.id')->column();
$pinnedContentIds = $pinnedQuery->select('content.id')->column();
if(!empty($pinnedContent)) {
if(!empty($pinnedContentIds)) {
// Increase query result limit to ensure all pinned entries are included in the first request
$this->query->limit += count($pinnedContent);
$this->query->limit += count($pinnedContentIds);
// Modify order - pinned content first
$oldOrder = $this->query->orderBy;
$this->query->orderBy("");
$this->query->addOrderBy(new Expression('CASE WHEN `content`.`id` IN ('.implode(',', $pinnedContent).') THEN 1 else 0 END DESC'));
$this->query->addOrderBy(new Expression('CASE WHEN `content`.`id` IN ('.implode(',', $pinnedContentIds).') THEN 1 else 0 END DESC'));
$this->query->addOrderBy($oldOrder);
}
} else {

4
protected/humhub/modules/user/stream/ProfileStreamQuery.php
View File

@ -35,8 +35,8 @@ class ProfileStreamQuery extends ContentContainerStreamQuery
$this->addFilterHandler(new IncludeAllContributionsFilter([
'container' => $this->container,
'scope' => $this->includeContributions
? IncludeAllContributionsFilter::SCOPE_PROFILE
: IncludeAllContributionsFilter::SCOPE_ALL
? IncludeAllContributionsFilter::SCOPE_ALL
: IncludeAllContributionsFilter::SCOPE_PROFILE
]));
}
}