Support WAI-ARIA's role="presentation" inside of WikiText.

[lhc/web/wiklou.git] / includes / libs / CSSMin.php

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index a2aa879..fc75cdc 100644 (file)
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -1,5 +1,7 @@
 <?php
-/*
+/**
+ * Minification of CSS stylesheets.
+ *
  * Copyright 2010 Wikimedia Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -12,12 +14,6 @@
  * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
  * OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
- */
-
-/**
- * Transforms CSS data
- *
- * This class provides minification, URL remapping, URL extracting, and data-URL embedding.
  *
  * @file
  * @version 0.1.1 -- 2010-09-11
@@ -25,6 +21,12 @@
  * @copyright Copyright 2010 Wikimedia Foundation
  * @license http://www.apache.org/licenses/LICENSE-2.0
  */
+
+/**
+ * Transforms CSS data
+ *
+ * This class provides minification, URL remapping, URL extracting, and data-URL embedding.
+ */
 class CSSMin {
 
        /* Constants */
@@ -79,6 +81,10 @@ class CSSMin {
                return $files;
        }
 
+       /**
+        * @param $file string
+        * @return bool|string
+        */
        protected static function getMimeType( $file ) {
                $realpath = realpath( $file );
                // Try a couple of different ways to get the mime-type of a file, in order of
@@ -112,10 +118,10 @@ class CSSMin {
         * @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;
@@ -130,14 +136,15 @@ class CSSMin {
                        // URLs with absolute paths like /w/index.php need to be expanded
                        // to absolute URLs but otherwise left alone
                        if ( $match['file'][0] !== '' && $match['file'][0][0] === '/' ) {
-                               // Replace the file path with an expanded URL
-                               // ...but only if wfExpandUrl() is even available. This will not be the case if we're running outside of MW
+                               // Replace the file path with an expanded (possibly protocol-relative) URL
+                               // ...but only if wfExpandUrl() is even available.
+                               // This will not be the case if we're running outside of MW
                                $lengthIncrease = 0;
                                if ( function_exists( 'wfExpandUrl' ) ) {
-                                       $expanded = wfExpandUrl( $match['file'][0] );
+                                       $expanded = wfExpandUrl( $match['file'][0], PROTO_RELATIVE );
                                        $origLength = strlen( $match['file'][0] );
                                        $lengthIncrease = strlen( $expanded ) - $origLength;
-                                       $source = substr_replace( $source, wfExpandUrl( $match['file'][0] ),
+                                       $source = substr_replace( $source, $expanded,
                                                $match['file'][1], $origLength
                                        );
                                }
@@ -145,6 +152,13 @@ class CSSMin {
                                $offset = $match[0][1] + strlen( $match[0][0] ) + $lengthIncrease;
                                continue;
                        }
+
+                       // Guard against double slashes, because "some/remote/../foo.png"
+                       // resolves to "some/remote/foo.png" on (some?) clients (bug 27052).
+                       if ( substr( $remote, -1 ) == '/' ) {
+                               $remote = substr( $remote, 0, -1 );
+                       }
+
                        // Shortcuts
                        $embed = $match['embed'][0];
                        $pre = $match['pre'][0];
@@ -152,16 +166,15 @@ class CSSMin {
                        $query = $match['query'][0];
                        $url = "{$remote}/{$match['file'][0]}";
                        $file = "{$local}/{$match['file'][0]}";
-                       // bug 27052 - Guard against double slashes, because foo//../bar
-                       // apparently resolves to foo/bar on (some?) clients
-                       $url = preg_replace( '#([^:])//+#', '\1/', $url );
+
                        $replacement = false;
+
                        if ( $local !== false && file_exists( $file ) ) {
                                // Add version parameter as a time-stamp in ISO 8601 format,
                                // 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