Ori.livneh has submitted this change and it was merged.
Change subject: CSSMin: remove dot segments in relative local URLs
......................................................................
CSSMin: remove dot segments in relative local URLs
Call wfRemoveDotSegments() (if available) on relative local URLs, so that
relative dot segments are collapsed.
Change-Id: Icc1c23a2a7d96c869412965bd8c3730d3c3b3a53
(cherry picked from commit 5844ebcd93c8f40761b6307bc24fc7865e9cd396)
---
M includes/libs/CSSMin.php
M tests/phpunit/includes/libs/CSSMinTest.php
2 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index b386a92..2c90431 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -399,7 +399,7 @@
if ( $local === false ) {
// Assume that all paths are relative to $remote, and
make them absolute
- return $remote . '/' . $url;
+ $url = $remote . '/' . $url;
} else {
// We drop the query part here and instead make the
path relative to $remote
$url = "{$remote}/{$file}";
@@ -418,8 +418,11 @@
}
// If any of these conditions failed (file missing, we
don't want to embed it
// or it's not embeddable), return the URL (possibly
with ?timestamp part)
- return $url;
}
+ if ( function_exists( 'wfRemoveDotSegments' ) ) {
+ $url = wfRemoveDotSegments( $url );
+ }
+ return $url;
}
/**
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php
b/tests/phpunit/includes/libs/CSSMinTest.php
index 22ad6ce..7841f30 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -102,12 +102,12 @@
array(
'Without trailing slash',
array( 'foo { prop: url(../bar.png); }', false,
'http://example.org/quux', false ),
- 'foo { prop:
url(http://example.org/quux/../bar.png); }',
+ 'foo { prop: url(http://example.org/bar.png);
}',
),
array(
'With trailing slash on remote (bug 27052)',
array( 'foo { prop: url(../bar.png); }', false,
'http://example.org/quux/', false ),
- 'foo { prop:
url(http://example.org/quux/../bar.png); }',
+ 'foo { prop: url(http://example.org/bar.png);
}',
),
array(
'Guard against stripping double slashes from
query',
--
To view, visit https://gerrit.wikimedia.org/r/232865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc1c23a2a7d96c869412965bd8c3730d3c3b3a53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.26wmf19
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
