dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1030cb2
)
Followup r82156: skip relative URLs with absolute paths too
author
Roan Kattouw
<catrope@users.mediawiki.org>
Wed, 16 Feb 2011 06:27:22 +0000
(06:27 +0000)
committer
Roan Kattouw
<catrope@users.mediawiki.org>
Wed, 16 Feb 2011 06:27:22 +0000
(06:27 +0000)
includes/libs/CSSMin.php
patch
|
blob
|
history
diff --git
a/includes/libs/CSSMin.php
b/includes/libs/CSSMin.php
index
5cd5a7d
..
e3b7cde
100644
(file)
--- a/
includes/libs/CSSMin.php
+++ b/
includes/libs/CSSMin.php
@@
-120,8
+120,8
@@
class CSSMin {
self::URL_REGEX . '(?P<post>[^;]*)[\;]?/';
$offset = 0;
while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) {
- // Skip absolute URIs
- if ( preg_match( '/^
https?:\/\/
/', $match['file'][0] ) ) {
+ // Skip absolute URIs
and relative URIs with absolute paths
+ if ( preg_match( '/^
(\/|https?:\/\/)
/', $match['file'][0] ) ) {
// Move the offset to the end of the match, leaving it alone
$offset = $match[0][1] + strlen( $match[0][0] );
continue;