Resolve complex arguments to LESS helper functions

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderLESSFunctions.php

diff --git a/includes/resourceloader/ResourceLoaderLESSFunctions.php b/includes/resourceloader/ResourceLoaderLESSFunctions.php
index 084bb54..e016a33 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLESSFunctions.php
+++ b/includes/resourceloader/ResourceLoaderLESSFunctions.php
@@ -37,13 +37,12 @@ class ResourceLoaderLESSFunctions {
         */
        public static function embeddable( $frame, $less ) {
                $base = pathinfo( $less->parser->sourceName, PATHINFO_DIRNAME );
-               $url = $frame[2][0];
+               $url = trim( $less->compileValue( $frame ), '"\'' );
                $file = realpath( $base . '/' . $url );
-               $embeddable = ( $file
+               return $less->toBool( $file
                        && strpos( $url, '//' ) === false
                        && filesize( $file ) < CSSMin::EMBED_SIZE_LIMIT
-                       && CSSMin::getMimeType( $file ) !== false ) ? 'true' : 'false';
-               return array( 'keyword', $embeddable );
+                       && CSSMin::getMimeType( $file ) !== false );
        }
 
        /**
@@ -58,11 +57,11 @@ class ResourceLoaderLESSFunctions {
         */
        public static function embed( $frame, $less ) {
                $base = pathinfo( $less->parser->sourceName, PATHINFO_DIRNAME );
-               $url = $frame[2][0];
+               $url = trim( $less->compileValue( $frame ), '"\'' );
                $file = realpath( $base . '/' . $url );
 
                $data = CSSMin::encodeImageAsDataURI( $file );
-               $less->embeddedFiles[ $file ] = filemtime( $file );
+               $less->addParsedFile( $file );
                return 'url(' . $data . ')';
        }
 }