diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-07-10 21:32:25 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-12-18 14:50:04 +0100 |
commit | c1c0f09949c85218b720280d84eca70dad51b65a (patch) | |
tree | 892de551fe0ec2e866cecef82c6602c4fd4bc99a /src/Wallabag/CoreBundle/Repository/EntryRepository.php | |
parent | ef5c8a7d01d7b3f0041455503499ab67e2206e0d (diff) | |
download | wallabag-c1c0f09949c85218b720280d84eca70dad51b65a.tar.gz wallabag-c1c0f09949c85218b720280d84eca70dad51b65a.tar.zst wallabag-c1c0f09949c85218b720280d84eca70dad51b65a.zip |
Added given_url in entry table
Diffstat (limited to 'src/Wallabag/CoreBundle/Repository/EntryRepository.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index b5e35eff..9e471d3c 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -314,8 +314,11 @@ class EntryRepository extends EntityRepository | |||
314 | */ | 314 | */ |
315 | public function findByUrlAndUserId($url, $userId) | 315 | public function findByUrlAndUserId($url, $userId) |
316 | { | 316 | { |
317 | $url = urldecode($url); | ||
318 | |||
317 | $res = $this->createQueryBuilder('e') | 319 | $res = $this->createQueryBuilder('e') |
318 | ->where('e.url = :url')->setParameter('url', urldecode($url)) | 320 | ->where('e.url = :url')->setParameter('url', $url) |
321 | ->orWhere('e.givenUrl = :url')->setParameter('url', $url) | ||
319 | ->andWhere('e.user = :user_id')->setParameter('user_id', $userId) | 322 | ->andWhere('e.user = :user_id')->setParameter('user_id', $userId) |
320 | ->getQuery() | 323 | ->getQuery() |
321 | ->getResult(); | 324 | ->getResult(); |