From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Thu, 9 Sep 2010 21:41:05 +0000 (+0000)
Subject: Fixes issues with complex background rules containing extra information after the... 
X-Git-Tag: 1.31.0-rc.0~35070
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=546378e5ab4c0a920b539f5e650dbeb9e8b5a5ec;p=lhc%2Fweb%2Fwiklou.git

Fixes issues with complex background rules containing extra information after the URL, while using quotes within the url.
---

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index 15dfa06e41..bfe179f453 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -82,7 +82,7 @@ class CSSMin {
 	 * @return string Remapped CSS data
 	 */
 	public static function remap( $source, $path, $embed = true ) {
-		$pattern = '/((?<embed>\s*\/\*\s*\@embed\s*\*\/)(?<rule>[^\;\}]*))?url\([\'"]?(?<file>[^\?\)\:]*)\??[^\)]*[\'"]?\)(?<extra>[^;]*)[\;]?/';
+		$pattern = '/((?<embed>\s*\/\*\s*\@embed\s*\*\/)(?<rule>[^\;\}]*))?url\([\'"]?(?<file>[^\?\)\:\'"]*)\??[^\)\'"]*[\'"]?\)(?<extra>[^;]*)[\;]?/';
 		$offset = 0;
 		while ( preg_match( $pattern, $source, $match, PREG_OFFSET_CAPTURE, $offset ) ) {
 			// Shortcuts