diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-16 19:45:37 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-09-16 19:45:37 +0200 |
| commit | b6d72e0c91be648208f8ee881876b11684c3247d (patch) | |
| tree | e69798d20213b54b76ee5f95c0ef36ea3bf25cea /src/Wallabag | |
| parent | 7083c0a21d27e7e1bf45a9807a76844116d61fb8 (diff) | |
| parent | 8013f35d96c42b15c1da28cdff40e97289ad4e25 (diff) | |
| download | wallabag-b6d72e0c91be648208f8ee881876b11684c3247d.tar.gz wallabag-b6d72e0c91be648208f8ee881876b11684c3247d.tar.zst wallabag-b6d72e0c91be648208f8ee881876b11684c3247d.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'src/Wallabag')
| -rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 34123eea..83379998 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
| @@ -450,7 +450,7 @@ class EntryRepository extends EntityRepository | |||
| 450 | */ | 450 | */ |
| 451 | private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc') | 451 | private function getSortedQueryBuilderByUser($userId, $sortBy = 'createdAt', $direction = 'desc') |
| 452 | { | 452 | { |
| 453 | return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId)); | 453 | return $this->sortQueryBuilder($this->getQueryBuilderByUser($userId), $sortBy, $direction); |
| 454 | } | 454 | } |
| 455 | 455 | ||
| 456 | /** | 456 | /** |