| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -242,6 +242,7 @@ |
| 243 | 243 | * (bug 33762) QueryPage-based special pages no longer misses *-summary message. |
| 244 | 244 | * Other sizes links are no longer generated for wikis without a 404 thumbnail handler. |
| 245 | 245 | * (bug 29454) Enforce byteLimit for page title input on Special:MovePage |
| | 246 | +* (bug 34114) CSSMin::remap() doesn't respect its $embed parameter |
| 246 | 247 | |
| 247 | 248 | === API changes in 1.19 === |
| 248 | 249 | * Made action=edit less likely to return "unknownerror", by returning the actual error |
| Index: trunk/phase3/CREDITS |
| — | — | @@ -108,6 +108,7 @@ |
| 109 | 109 | * FunPika |
| 110 | 110 | * fomafix |
| 111 | 111 | * Gero Scholz |
| | 112 | +* Gilles van den Hoven |
| 112 | 113 | * Grunny |
| 113 | 114 | * Harry Burt |
| 114 | 115 | * Ireas |
| Index: trunk/phase3/includes/libs/CSSMin.php |
| — | — | @@ -116,10 +116,10 @@ |
| 117 | 117 | * @param $source string CSS data to remap |
| 118 | 118 | * @param $local string File path where the source was read from |
| 119 | 119 | * @param $remote string URL path to the file |
| 120 | | - * @param $embed ??? |
| | 120 | + * @param $embedData bool If false, never do any data URI embedding, even if / * @embed * / is found |
| 121 | 121 | * @return string Remapped CSS data |
| 122 | 122 | */ |
| 123 | | - public static function remap( $source, $local, $remote, $embed = true ) { |
| | 123 | + public static function remap( $source, $local, $remote, $embedData = true ) { |
| 124 | 124 | $pattern = '/((?P<embed>\s*\/\*\s*\@embed\s*\*\/)(?P<pre>[^\;\}]*))?' . |
| 125 | 125 | self::URL_REGEX . '(?P<post>[^;]*)[\;]?/'; |
| 126 | 126 | $offset = 0; |
| — | — | @@ -166,7 +166,7 @@ |
| 167 | 167 | // using Z for the timezone, meaning GMT |
| 168 | 168 | $url .= '?' . gmdate( 'Y-m-d\TH:i:s\Z', round( filemtime( $file ), -2 ) ); |
| 169 | 169 | // Embedding requires a bit of extra processing, so let's skip that if we can |
| 170 | | - if ( $embed ) { |
| | 170 | + if ( $embedData && $embed ) { |
| 171 | 171 | $type = self::getMimeType( $file ); |
| 172 | 172 | // Detect when URLs were preceeded with embed tags, and also verify file size is |
| 173 | 173 | // below the limit |