diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2016-06-29 20:52:37 +0200 |
|---|---|---|
| committer | Thomas Citharel <tcit@tcit.fr> | 2016-06-29 20:52:37 +0200 |
| commit | 4f0558a0d43b3d0bbd661c06568257a91836fa91 (patch) | |
| tree | c79b5cd53b9c2b1a2463d2809cc059fe7d74a65c | |
| parent | 28803f106bd091b5a7540a134cba2545d12d25ea (diff) | |
| download | wallabag-4f0558a0d43b3d0bbd661c06568257a91836fa91.tar.gz wallabag-4f0558a0d43b3d0bbd661c06568257a91836fa91.tar.zst wallabag-4f0558a0d43b3d0bbd661c06568257a91836fa91.zip | |
fix merge issue
| -rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 8d2ec9ce..b543c5ae 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
| @@ -111,7 +111,8 @@ class EntryRepository extends EntityRepository | |||
| 111 | 111 | ||
| 112 | if ($since >= 0) { | 112 | if ($since >= 0) { |
| 113 | $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); | 113 | $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); |
| 114 | 114 | } | |
| 115 | |||
| 115 | if ('' !== $tags) { | 116 | if ('' !== $tags) { |
| 116 | foreach (explode(',', $tags) as $tag) { | 117 | foreach (explode(',', $tags) as $tag) { |
| 117 | $qb->andWhere('t.label = :label')->setParameter('label', $tag); | 118 | $qb->andWhere('t.label = :label')->setParameter('label', $tag); |