From b8b8a3c692c82c467601c402462a65d15c9a0b89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Wed, 12 Jun 2019 00:50:02 +0200 Subject: [PATCH] ResourceLoaderOOUIIconPackModule: Always use MW core 'localBasePath' Otherwise, extensions defining icon pack modules in extension.json would need to specify "localBasePath": "../..", which is silly. Follow-up to a8dae2212cc5e23e181023af2ba1891078b14355. Change-Id: If8f02867955d649c809b6b41de0f77e594b633d6 --- includes/resourceloader/ResourceLoaderImageModule.php | 2 +- .../resourceloader/ResourceLoaderOOUIIconPackModule.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php index 9b50d80f69..db292ccdda 100644 --- a/includes/resourceloader/ResourceLoaderImageModule.php +++ b/includes/resourceloader/ResourceLoaderImageModule.php @@ -113,7 +113,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule { * @throws InvalidArgumentException */ public function __construct( $options = [], $localBasePath = null ) { - $this->localBasePath = self::extractLocalBasePath( $options, $localBasePath ); + $this->localBasePath = static::extractLocalBasePath( $options, $localBasePath ); $this->definition = $options; } diff --git a/includes/resourceloader/ResourceLoaderOOUIIconPackModule.php b/includes/resourceloader/ResourceLoaderOOUIIconPackModule.php index 0c70ee1266..c860362af7 100644 --- a/includes/resourceloader/ResourceLoaderOOUIIconPackModule.php +++ b/includes/resourceloader/ResourceLoaderOOUIIconPackModule.php @@ -69,4 +69,13 @@ class ResourceLoaderOOUIIconPackModule extends ResourceLoaderOOUIImageModule { return $definition; } + + public static function extractLocalBasePath( $options, $localBasePath = null ) { + global $IP; + if ( $localBasePath === null ) { + $localBasePath = $IP; + } + // Ignore any 'localBasePath' present in $options, this always refers to files in MediaWiki core + return $localBasePath; + } } -- 2.20.1