diff options
author | lizyn <zhiylin@outlook.com> | 2020-02-24 10:04:13 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-24 10:04:13 +0800 |
commit | b19df31d78d881a43bcf6b3215e5fc3781e8e8aa (patch) | |
tree | d0d9861694a4b5e5fbfdbeb53c255ecd15fe9328 /src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |
parent | 4d0c632c70ea50d459c3c55ddda2e0f394dd51cb (diff) | |
parent | 04d918cae0227c06a41d27fb6533dddbf30dfe71 (diff) | |
download | wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.gz wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.tar.zst wallabag-b19df31d78d881a43bcf6b3215e5fc3781e8e8aa.zip |
Merge pull request #1 from wallabag/master
Keep up with the master again
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index 1c2c5093..3d56a6d8 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |||
@@ -20,10 +20,9 @@ class PreparePagerForEntries | |||
20 | } | 20 | } |
21 | 21 | ||
22 | /** | 22 | /** |
23 | * @param AdapterInterface $adapter | 23 | * @param User $user If user isn't logged in, we can force it (like for feed) |
24 | * @param User $user If user isn't logged in, we can force it (like for rss) | ||
25 | * | 24 | * |
26 | * @return null|Pagerfanta | 25 | * @return Pagerfanta|null |
27 | */ | 26 | */ |
28 | public function prepare(AdapterInterface $adapter, User $user = null) | 27 | public function prepare(AdapterInterface $adapter, User $user = null) |
29 | { | 28 | { |