aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2018-10-24 22:27:27 +0200
committerKevin Decherf <kevin@kdecherf.com>2018-10-24 22:27:27 +0200
commit60599679519e819301ce36185c3dd5ca7aa7f4ec (patch)
tree34a9d96e7d909fcbdef3b141ee4c8b4235f9ef6a
parent44e63667d9cf331aeedef8cb964538823c0a145d (diff)
downloadwallabag-60599679519e819301ce36185c3dd5ca7aa7f4ec.tar.gz
wallabag-60599679519e819301ce36185c3dd5ca7aa7f4ec.tar.zst
wallabag-60599679519e819301ce36185c3dd5ca7aa7f4ec.zip
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 <kevin@kdecherf.com>
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php2
-rw-r--r--tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php12
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
374 $entry->setUrl($url); 374 $entry->setUrl($url);
375 break; 375 break;
376 case ['fragment']: 376 case ['fragment']:
377 case ['query']:
378 case ['fragment', 'query']:
379 // noop 377 // noop
380 break; 378 break;
381 default: 379 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
777 null, 777 null,
778 'example.com', 778 'example.com',
779 ], 779 ],
780 'no query string in fetched content' => [
781 'https://example.org/hello?world=1',
782 null,
783 'https://example.org/hello',
784 'https://example.org/hello?world=1',
785 null,
786 'example.org',
787 ],
788 'query string in fetched content' => [ 780 'query string in fetched content' => [
789 'https://example.org/hello', 781 'https://example.org/hello',
790 null, 782 null,
791 'https://example.org/hello?world=1', 783 'https://example.org/hello?world=1',
784 'https://example.org/hello?world=1',
792 'https://example.org/hello', 785 'https://example.org/hello',
793 null,
794 'example.org', 786 'example.org',
795 ], 787 ],
796 'fragment in fetched content' => [ 788 'fragment in fetched content' => [
@@ -805,8 +797,8 @@ class ContentProxyTest extends TestCase
805 'https://example.org/hello', 797 'https://example.org/hello',
806 null, 798 null,
807 'https://example.org/hello?foo#world', 799 'https://example.org/hello?foo#world',
800 'https://example.org/hello?foo#world',
808 'https://example.org/hello', 801 'https://example.org/hello',
809 null,
810 'example.org', 802 'example.org',
811 ], 803 ],
812 'different path and query string in fetch content' => [ 804 'different path and query string in fetch content' => [