GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[COMPONENT][Collection] Make MetaCollectionPlugin a trait and abstract collection delete and name update

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro
2022-01-04 21:58:49 +00:00
parent 754135743e
commit 9df9c6a19c
5 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/Collection/Util/Controller/Collection.php
View File

@@ -11,10 +11,10 @@ use Component\Feed\Feed;
class Collection extends Controller
{
public function query(string $query, ?string $language = null, ?Actor $actor = null)
public function query(string $query, ?string $locale = null, ?Actor $actor = null)
{
$actor ??= Common::actor();
$language ??= $actor->getTopLanguage()->getLocale();
return Feed::query($query, $this->int('page') ?? 1, $language, $actor);
$actor ??= Common::actor();
$locale ??= Common::currentLanguage()->getLocale();
return Feed::query($query, $this->int('page') ?? 1, $locale, $actor);
}
}