tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9036 from Taitava/urlsegment-colon-fix

Browse Source 
URLSegmentFilter: Remove : characters from url segments when multibyt…
This commit is contained in:
Robbie Averill 2019-06-04 09:26:56 +12:00 committed by GitHub
commit 23d6890820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/View/Parsers/URLSegmentFilter.php
View File

@ -36,7 +36,7 @@ class URLSegmentFilter
'/\s|\+/u' => '-', // remove whitespace/plus '/\s|\+/u' => '-', // remove whitespace/plus
'/[_.]+/u' => '-', // underscores and dots to dashes '/[_.]+/u' => '-', // underscores and dots to dashes
'/[^A-Za-z0-9\-]+/u' => '', // remove non-ASCII chars, only allow alphanumeric and dashes '/[^A-Za-z0-9\-]+/u' => '', // remove non-ASCII chars, only allow alphanumeric and dashes
'/[\/\?=#]+/u' => '-', // remove forward slashes, question marks, equal signs and hashes in case multibyte is allowed (and non-ASCII chars aren't removed) '/[\/\?=#:]+/u' => '-', // remove forward slashes, question marks, equal signs, hashes and colons in case multibyte is allowed (and non-ASCII chars aren't removed)
'/[\-]{2,}/u' => '-', // remove duplicate dashes '/[\-]{2,}/u' => '-', // remove duplicate dashes
'/^[\-]+/u' => '', // Remove all leading dashes '/^[\-]+/u' => '', // Remove all leading dashes
'/[\-]+$/u' => '' // Remove all trailing dashes '/[\-]+$/u' => '' // Remove all trailing dashes

2
tests/php/ORM/URLSegmentFilterTest.php
View File

@ -113,6 +113,6 @@ class URLSegmentFilterTest extends SapphireTest
{ {
$filter = new URLSegmentFilter(); $filter = new URLSegmentFilter();
$filter->setAllowMultibyte(true); $filter->setAllowMultibyte(true);
$this->assertEquals('url-with-bad-characters', $filter->filter('url?-with/-bad#-characters=')); $this->assertEquals('url-with-some-bad-characters', $filter->filter('url?-with/-some:-bad#-characters='));
} }
} }