pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
Thomas Citharel
2016-06-29 20:52:37 +02:00
parent 28803f106b
commit 4f0558a0d4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View File

@ -111,7 +111,8 @@ class EntryRepository extends EntityRepository
if ($since >= 0) { if ($since >= 0) {
$qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since))); $qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since)));
}
if ('' !== $tags) { if ('' !== $tags) {
foreach (explode(',', $tags) as $tag) { foreach (explode(',', $tags) as $tag) {
$qb->andWhere('t.label = :label')->setParameter('label', $tag); $qb->andWhere('t.label = :label')->setParameter('label', $tag);