devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-15 18:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid duplicate url with accents

Browse Source
This commit is contained in:
Jeremy Benoist 2016-10-01 17:57:38 +02:00
parent c4bf7af96f
commit 19ca0b2f35
No known key found for this signature in database
GPG Key ID: BCA73962457ACC3C
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,7 +281,7 @@ class EntryRepository extends EntityRepository
public function findByUrlAndUserId($url, $userId) public function findByUrlAndUserId($url, $userId)
{ {
$res = $this->createQueryBuilder('e') $res = $this->createQueryBuilder('e')
->where('e.url = :url')->setParameter('url', $url) ->where('e.url = :url')->setParameter('url', urldecode($url))
->andWhere('e.user = :user_id')->setParameter('user_id', $userId) ->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
->getQuery() ->getQuery()
->getResult(); ->getResult();

35
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View File

@ -160,6 +160,41 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertContains('/view/', $client->getResponse()->getTargetUrl()); $this->assertContains('/view/', $client->getResponse()->getTargetUrl());
} }
public function testPostNewOkUrlExistWithAccent()
{
$this->logInAs('admin');
$client = $this->getClient();
$url = 'http://www.aritylabs.com/post/106091708292/des-contr%C3%B4leurs-optionnels-gr%C3%A2ce-%C3%A0-constmissing';
$crawler = $client->request('GET', '/new');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('form[name=entry]')->form();
$data = [
'entry[url]' => $url,
];
$client->submit($form, $data);
$crawler = $client->request('GET', '/new');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$form = $crawler->filter('form[name=entry]')->form();
$data = [
'entry[url]' => $url,
];
$client->submit($form, $data);
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$this->assertContains('/view/', $client->getResponse()->getTargetUrl());
}
/** /**
* This test will require an internet connection. * This test will require an internet connection.
*/ */