From 495f9fa290939a064967d9bddeb2ae966fae9e85 Mon Sep 17 00:00:00 2001 From: Jack Phoenix Date: Fri, 6 Sep 2019 19:37:42 +0300 Subject: [PATCH] resourceloader: Add $conf parameter to the 'ResourceLoaderGetConfigVars' hook Change-Id: I3cca8ce87b303ef7dfd96bfe1fdda0c51c441f6f --- docs/hooks.txt | 1 + includes/resourceloader/ResourceLoaderStartUpModule.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/hooks.txt b/docs/hooks.txt index b7ea02cea3..a248c29075 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -2827,6 +2827,7 @@ or request state must be added through MakeGlobalVariablesScript instead. Skin is made available for skin specific config. &$vars: [ variable name => value ] $skin: Skin +$config: Config object (since 1.34) 'ResourceLoaderJqueryMsgModuleMagicWords': Called in ResourceLoaderJqueryMsgModule to allow adding magic words for jQueryMsg. diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index d4a34f3352..9f583a5933 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -121,7 +121,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { 'wgCommentCodePointLimit' => CommentStore::COMMENT_CHARACTER_LIMIT, ]; - Hooks::run( 'ResourceLoaderGetConfigVars', [ &$vars, $skin ] ); + Hooks::run( 'ResourceLoaderGetConfigVars', [ &$vars, $skin, $conf ] ); return $vars; } -- 2.20.1