fix merge issue

2016-06-29 20:52:37 +02:00
parent 28803f106b
commit 4f0558a0d4
1 changed files with 2 additions and 1 deletions
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@ -111,6 +111,7 @@ 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) {