https://www.mediawiki.org/wiki/Special:Code/MediaWiki/110557
Revision: 110557
Author: catrope
Date: 2012-02-02 10:30:57 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
(bug 34114) CSSMin::remap() doesn't respect its $embed parameter. Patch by
Gilles van den Hoven
Modified Paths:
--------------
trunk/phase3/CREDITS
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/libs/CSSMin.php
Modified: trunk/phase3/CREDITS
===================================================================
--- trunk/phase3/CREDITS 2012-02-02 10:13:57 UTC (rev 110556)
+++ trunk/phase3/CREDITS 2012-02-02 10:30:57 UTC (rev 110557)
@@ -108,6 +108,7 @@
* FunPika
* fomafix
* Gero Scholz
+* Gilles van den Hoven
* Grunny
* Harry Burt
* Ireas
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2012-02-02 10:13:57 UTC (rev 110556)
+++ trunk/phase3/RELEASE-NOTES-1.19 2012-02-02 10:30:57 UTC (rev 110557)
@@ -242,6 +242,7 @@
* (bug 33762) QueryPage-based special pages no longer misses *-summary message.
* Other sizes links are no longer generated for wikis without a 404 thumbnail
handler.
* (bug 29454) Enforce byteLimit for page title input on Special:MovePage
+* (bug 34114) CSSMin::remap() doesn't respect its $embed parameter
=== API changes in 1.19 ===
* Made action=edit less likely to return "unknownerror", by returning the
actual error
Modified: trunk/phase3/includes/libs/CSSMin.php
===================================================================
--- trunk/phase3/includes/libs/CSSMin.php 2012-02-02 10:13:57 UTC (rev
110556)
+++ trunk/phase3/includes/libs/CSSMin.php 2012-02-02 10:30:57 UTC (rev
110557)
@@ -116,10 +116,10 @@
* @param $source string CSS data to remap
* @param $local string File path where the source was read from
* @param $remote string URL path to the file
- * @param $embed ???
+ * @param $embedData bool If false, never do any data URI embedding,
even if / * @embed * / is found
* @return string Remapped CSS data
*/
- public static function remap( $source, $local, $remote, $embed = true )
{
+ public static function remap( $source, $local, $remote, $embedData =
true ) {
$pattern =
'/((?P<embed>\s*\/\*\s*\@embed\s*\*\/)(?P<pre>[^\;\}]*))?' .
self::URL_REGEX . '(?P<post>[^;]*)[\;]?/';
$offset = 0;
@@ -166,7 +166,7 @@
// using Z for the timezone, meaning GMT
$url .= '?' . gmdate( 'Y-m-d\TH:i:s\Z', round(
filemtime( $file ), -2 ) );
// Embedding requires a bit of extra
processing, so let's skip that if we can
- if ( $embed ) {
+ if ( $embedData && $embed ) {
$type = self::getMimeType( $file );
// Detect when URLs were preceeded with
embed tags, and also verify file size is
// below the limit
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
