diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-10-18 11:16:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 11:16:50 +0200 |
| commit | 91f9bacf735e61072d6f0e9f47cc5ec6401193c7 (patch) | |
| tree | a8837114af6a4aa86f3af36bc7b2f5e697de9ee9 /src/Wallabag | |
| parent | 7f5d03a98d59afa171ccc003a48715f13fa3b116 (diff) | |
| parent | 0978bd849e77b1157b21f8e231965521e535bacd (diff) | |
| download | wallabag-91f9bacf735e61072d6f0e9f47cc5ec6401193c7.tar.gz wallabag-91f9bacf735e61072d6f0e9f47cc5ec6401193c7.tar.zst wallabag-91f9bacf735e61072d6f0e9f47cc5ec6401193c7.zip | |
Merge pull request #3362 from sviande/fix_3361_api_warning
Fix #3361 check type for tags in entry repository
Diffstat (limited to 'src/Wallabag')
| -rw-r--r-- | src/Wallabag/ApiBundle/Controller/EntryRestController.php | 2 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php index 86e72335..6f161a08 100644 --- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php | |||
| @@ -102,7 +102,7 @@ class EntryRestController extends WallabagRestController | |||
| 102 | $order = $request->query->get('order', 'desc'); | 102 | $order = $request->query->get('order', 'desc'); |
| 103 | $page = (int) $request->query->get('page', 1); | 103 | $page = (int) $request->query->get('page', 1); |
| 104 | $perPage = (int) $request->query->get('perPage', 30); | 104 | $perPage = (int) $request->query->get('perPage', 30); |
| 105 | $tags = $request->query->get('tags', ''); | 105 | $tags = is_array($request->query->get('tags')) ? '' : (string) $request->query->get('tags', ''); |
| 106 | $since = $request->query->get('since', 0); | 106 | $since = $request->query->get('since', 0); |
| 107 | 107 | ||
| 108 | /** @var \Pagerfanta\Pagerfanta $pager */ | 108 | /** @var \Pagerfanta\Pagerfanta $pager */ |
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 05f0e0ba..b5e35eff 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
| @@ -151,7 +151,7 @@ class EntryRepository extends EntityRepository | |||
| 151 | $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); | 151 | $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | if ('' !== $tags) { | 154 | if (is_string($tags) && '' !== $tags) { |
| 155 | foreach (explode(',', $tags) as $i => $tag) { | 155 | foreach (explode(',', $tags) as $i => $tag) { |
| 156 | $entryAlias = 'e' . $i; | 156 | $entryAlias = 'e' . $i; |
| 157 | $tagAlias = 't' . $i; | 157 | $tagAlias = 't' . $i; |