diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2021-12-13 23:52:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2021-12-13 23:52:14 +0000 |
| commit | c648896ab7d9ad0038e3ebee1756d6487442bb1b (patch) | |
| tree | f2386f010366345a04285429f7787e0b9c9a9853 | |
| parent | 56d44f0bc44107782362c635a1699605e82d9515 (diff) | |
| parent | 5ad1190f67a26f1a397724d9e783766c14ded2e4 (diff) | |
Merge "Remove unreachable parts of getTitleInvalidRegex() in PHP and JS"
| -rw-r--r-- | includes/title/MediaWikiTitleCodec.php | 2 | ||||
| -rw-r--r-- | resources/src/mediawiki.Title/Title.js | 4 | ||||
| -rw-r--r-- | tests/phpunit/includes/TitleTest.php | 2 | ||||
| -rw-r--r-- | tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js | 4 |
4 files changed, 1 insertions, 11 deletions
diff --git a/includes/title/MediaWikiTitleCodec.php b/includes/title/MediaWikiTitleCodec.php index b253f055cc5a..f70aa9fc0e40 100644 --- a/includes/title/MediaWikiTitleCodec.php +++ b/includes/title/MediaWikiTitleCodec.php @@ -599,8 +599,6 @@ class MediaWikiTitleCodec implements TitleFormatter, TitleParser { '|%[0-9A-Fa-f]{2}' . # XML/HTML character references produce similar issues. '|&[A-Za-z0-9\x80-\xff]+;' . - '|&#[0-9]+;' . - '|&#x[0-9A-Fa-f]+;' . '/S'; } diff --git a/resources/src/mediawiki.Title/Title.js b/resources/src/mediawiki.Title/Title.js index dc4fe79fe95a..bc4ba243f2d3 100644 --- a/resources/src/mediawiki.Title/Title.js +++ b/resources/src/mediawiki.Title/Title.js @@ -148,9 +148,7 @@ var toUpperMap, // to round-trip titles -- you can't link to them consistently. '|%[\\dA-Fa-f]{2}' + // XML/HTML character references produce similar issues. - '|&[\\dA-Za-z\u0080-\uFFFF]+;' + - '|&#\\d+;' + - '|&#x[\\dA-Fa-f]+;' + '|&[\\dA-Za-z\u0080-\uFFFF]+;' ), // From MediaWikiTitleCodec::splitTitleString() in PHP diff --git a/tests/phpunit/includes/TitleTest.php b/tests/phpunit/includes/TitleTest.php index cb8491bae3c5..3d97501c040d 100644 --- a/tests/phpunit/includes/TitleTest.php +++ b/tests/phpunit/includes/TitleTest.php @@ -822,8 +822,6 @@ class TitleTest extends MediaWikiIntegrationTestCase { // Note: Commented out because they are not marked invalid by the PHP test as // Title::newFromText runs Sanitizer::decodeCharReferencesAndNormalize first. // 'A é B', - // 'A é B', - // 'A é B', // Subject of NS_TALK does not roundtrip to NS_MAIN [ 'Talk:File:Example.svg', 'title-invalid-talk-namespace' ], // Directory navigation diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js index f2824d792b51..f2d48f0651d5 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js @@ -45,11 +45,7 @@ 'A%23B', 'A%2523B', // XML/HTML character entity references - // Note: The ones with # are commented out as those are interpreted as fragment and - // as such end up being valid. 'A é B', - // 'A é B', - // 'A é B', // Subject of NS_TALK does not roundtrip to NS_MAIN 'Talk:File:Example.svg', // Directory navigation |