diff options
| author | Kevin Decherf <kevin@kdecherf.com> | 2019-02-13 15:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 15:05:57 +0100 |
| commit | b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5 (patch) | |
| tree | c8c5ab6b1354782c82139a12372c3532001124fd /src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |
| parent | 47e47841105a34c852744e207b4a0ea9e879ec49 (diff) | |
| parent | 44560c77677d1d2a0eda0bf63f56c9dff033744f (diff) | |
| download | wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.tar.gz wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.tar.zst wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.zip | |
Merge pull request #3882 from wallabag/fix/cors
Fix CORS for API
Diffstat (limited to 'src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php')
| -rw-r--r-- | src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index 1c2c5093..183d394a 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |||
| @@ -23,7 +23,7 @@ class PreparePagerForEntries | |||
| 23 | * @param AdapterInterface $adapter | 23 | * @param AdapterInterface $adapter |
| 24 | * @param User $user If user isn't logged in, we can force it (like for rss) | 24 | * @param User $user If user isn't logged in, we can force it (like for rss) |
| 25 | * | 25 | * |
| 26 | * @return null|Pagerfanta | 26 | * @return Pagerfanta|null |
| 27 | */ | 27 | */ |
| 28 | public function prepare(AdapterInterface $adapter, User $user = null) | 28 | public function prepare(AdapterInterface $adapter, User $user = null) |
| 29 | { | 29 | { |