Merge "resourceloader: ResourceLoaderGetConfigVars is passed skin"

diff --combined docs/hooks.txt
index ffefe97,96ddf1d..f9ae150
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -1480,10 -1480,11 +1480,10 @@@ textarea in the edit form
  &$buttons: Array of edit buttons "Save", "Preview", "Live", and "Diff"
  &$tabindex: HTML tabindex of the last edit check/button
  
 -'EditPageBeforeEditToolbar': Allows modifying the edit toolbar above the
 -textarea in the edit form.
 -Hook subscribers can return false to avoid the default toolbar code being
 -loaded.
 -&$toolbar: The toolbar HTML
 +'EditPageBeforeEditToolbar': Allow adding an edit toolbar above the textarea in
 +the edit form.
 +&$toolbar: The toolbar HTML, initially an empty `<div id="toolbar"></div>`
 +Hook subscribers can return false to have no toolbar HTML be loaded.
  
  'EditPageCopyrightWarning': Allow for site and per-namespace customization of
  contribution/copyright notice.
@@@ -2876,7 -2877,9 +2876,9 @@@ $context: ResourceLoaderContext|nul
  ResourceLoaderStartUpModule::getConfigSettings(). Use this to export static
  configuration variables to JavaScript. Things that depend on the current page
  or request state must be added through MakeGlobalVariablesScript instead.
+ Skin is made available for skin specific config.
  &$vars: [ variable name => value ]
+ $skin: Skin
  
  'ResourceLoaderJqueryMsgModuleMagicWords': Called in
  ResourceLoaderJqueryMsgModule to allow adding magic words for jQueryMsg.