Merge "Add Status outparam for AbortNewAccount hook to fix API error handling"

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

diff --git a/includes/resourceloader/ResourceLoaderLESSFunctions.php b/includes/resourceloader/ResourceLoaderLESSFunctions.php
index 084bb54..c7570f6 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLESSFunctions.php
+++ b/includes/resourceloader/ResourceLoaderLESSFunctions.php
@@ -39,11 +39,10 @@ class ResourceLoaderLESSFunctions {
                $base = pathinfo( $less->parser->sourceName, PATHINFO_DIRNAME );
                $url = $frame[2][0];
                $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 );
        }
 
        /**
@@ -62,7 +61,7 @@ class ResourceLoaderLESSFunctions {
                $file = realpath( $base . '/' . $url );
 
                $data = CSSMin::encodeImageAsDataURI( $file );
-               $less->embeddedFiles[ $file ] = filemtime( $file );
+               $less->addParsedFile( $file );
                return 'url(' . $data . ')';
        }
 }