From 60599679519e819301ce36185c3dd5ca7aa7f4ec Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Wed, 24 Oct 2018 22:27:27 +0200 Subject: [PATCH] updateOriginUrl: remove 'query string' case from ignore list Two urls with a different query string may refer to two different pages so keep them both. Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Helper/ContentProxy.php | 2 -- .../Wallabag/CoreBundle/Helper/ContentProxyTest.php | 12 ++---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index a93f4a2d..74130be8 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php @@ -374,8 +374,6 @@ class ContentProxy $entry->setUrl($url); break; case ['fragment']: - case ['query']: - case ['fragment', 'query']: // noop break; default: diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php index a60aec5b..3dd9273c 100644 --- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php +++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php @@ -777,20 +777,12 @@ class ContentProxyTest extends TestCase null, 'example.com', ], - 'no query string in fetched content' => [ - 'https://example.org/hello?world=1', - null, - 'https://example.org/hello', - 'https://example.org/hello?world=1', - null, - 'example.org', - ], 'query string in fetched content' => [ 'https://example.org/hello', null, 'https://example.org/hello?world=1', + 'https://example.org/hello?world=1', 'https://example.org/hello', - null, 'example.org', ], 'fragment in fetched content' => [ @@ -805,8 +797,8 @@ class ContentProxyTest extends TestCase 'https://example.org/hello', null, 'https://example.org/hello?foo#world', + 'https://example.org/hello?foo#world', 'https://example.org/hello', - null, 'example.org', ], 'different path and query string in fetch content' => [ -- 2.41.0