Merge "TitleInputWidget: Correct links when 'relative' option used"

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

diff --git a/includes/resourceloader/ResourceLoaderEditToolbarModule.php b/includes/resourceloader/ResourceLoaderEditToolbarModule.php
index 0049421..f3fae0e 100644 (file)
--- a/includes/resourceloader/ResourceLoaderEditToolbarModule.php
+++ b/includes/resourceloader/ResourceLoaderEditToolbarModule.php
@@ -32,6 +32,7 @@ class ResourceLoaderEditToolbarModule extends ResourceLoaderFileModule {
         *
         * @param string $value
         * @return string
+        * @throws Exception
         */
        private static function cssSerializeString( $value ) {
                if ( strstr( $value, "\0" ) ) {
@@ -64,25 +65,10 @@ class ResourceLoaderEditToolbarModule extends ResourceLoaderFileModule {
        }
 
        /**
-        * @param ResourceLoaderContext $context
-        * @return int UNIX timestamp
-        */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return max(
-                       parent::getModifiedTime( $context ),
-                       $this->getHashMtime( $context )
-               );
-       }
-
-       /**
-        * @param ResourceLoaderContext $context
-        * @return string Hash
+        * @return bool
         */
-       public function getModifiedHash( ResourceLoaderContext $context ) {
-               return md5(
-                       parent::getModifiedHash( $context ) .
-                       serialize( $this->getLessVars( $context ) )
-               );
+       public function enableModuleContentVersion() {
+               return true;
        }
 
        /**
@@ -94,7 +80,7 @@ class ResourceLoaderEditToolbarModule extends ResourceLoaderFileModule {
         * @param ResourceLoaderContext $context
         * @return lessc
         */
-       protected function getLessCompiler( ResourceLoaderContext $context ) {
+       protected function getLessCompiler( ResourceLoaderContext $context = null ) {
                $compiler = parent::getLessCompiler();
                $compiler->setVariables( $this->getLessVars( $context ) );
                return $compiler;