Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Follow-up r102587. Add details to comments and add a couple more tests.

Browse source
This commit is contained in:
gicode 2011-11-10 18:02:38 +00:00
parent 41077bffdc
commit fc9b3e1d92
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/GlobalFunctions.php
View file

@ -503,22 +503,23 @@ function wfRemoveDotSegments( $urlPath ) {
while ( $urlPath ) {
$matches = null;
if ( preg_match('%^\.\.?/%', $urlPath, $matches) ) {
# Step A
# Step A, remove leading "../" or "./"
$urlPath = substr( $urlPath, strlen( $matches[0] ) );
} elseif ( preg_match( '%^/\.(/|$)%', $urlPath, $matches ) ) {
# Step B
# Step B, replace leading "/.$" or "/./" with "/"
$start = strlen( $matches[0] );
$urlPath = '/' . substr( $urlPath, $start );
} elseif ( preg_match( '%^/\.\.(/|$)%', $urlPath, $matches ) ) {
# Step C
# Step C, replace leading "/..$" or "/../" with "/" and
# remove last path component in output
$start = strlen( $matches[0] );
$urlPath = '/' . substr( $urlPath, $start );
$output = preg_replace('%(^|/)[^/]*$%', '', $output);
} elseif ( preg_match( '%^\.\.?$%', $urlPath, $matches ) ) {
# Step D
$urlPath = substr( $urlPath, strlen( $matches[0] ) );
# Step D, remove "^..$" or "^.$"
$urlPath = '';
} else {
# Step E
# Step E, move leading path segment to output
preg_match( '%^/?[^/]*%', $urlPath, $matches );
$urlPath = substr( $urlPath, strlen( $matches[0] ) );
$output .= $matches[0];

3
tests/phpunit/includes/GlobalFunctions/wfRemoveDotSegmentsTest.php
View file

@ -23,11 +23,14 @@ class wfRemoveDotSegments extends MediaWikiTestCase {
array( '/a/b/c/./../../g', '/a/g' ),
array( 'mid/content=5/../6', 'mid/6' ),
array( '/a//../b', '/a/b' ),
array( '/.../a', '/.../a' ),
array( '.../a', '.../a' ),
array( '', '' ),
array( '/', '/' ),
array( '//', '//' ),
array( '.', '' ),
array( '..', '' ),
array( '...', '...' ),
array( '/.', '/' ),
array( '/..', '/' ),
array( './', '' ),