From 4f0558a0d43b3d0bbd661c06568257a91836fa91 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 29 Jun 2016 20:52:37 +0200 Subject: [PATCH] fix merge issue --- src/Wallabag/CoreBundle/Repository/EntryRepository.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 if ($since >= 0) { $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); - + } + if ('' !== $tags) { foreach (explode(',', $tags) as $tag) { $qb->andWhere('t.label = :label')->setParameter('label', $tag); -- 2.41.0