jenkins-bot has submitted this change and it was merged.
Change subject: VisualEditor.hooks: Sort keys
......................................................................
VisualEditor.hooks: Sort keys
Change-Id: I68f9258f739532ca30d2fdc91e62d6a2f87a5180
---
M VisualEditor.hooks.php
1 file changed, 13 insertions(+), 10 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php
index 37744e8..668c449 100644
--- a/VisualEditor.hooks.php
+++ b/VisualEditor.hooks.php
@@ -125,12 +125,12 @@
global $wgStylePath, $wgContLang;
$vars['wgVisualEditor'] = array(
'isPageWatched' => $out->getUser()->isWatched(
$out->getTitle() ),
- 'pageLanguageCode' =>
$out->getTitle()->getPageLanguage()->getHtmlCode(),
- 'pageLanguageDir' =>
$out->getTitle()->getPageLanguage()->getDir(),
// Same as in Linker.php
'magnifyClipIconURL' => $wgStylePath .
'/common/images/magnify-clip' .
- ( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png'
+ ( $wgContLang->isRTL() ? '-rtl' : '' ) . '.png',
+ 'pageLanguageCode' =>
$out->getTitle()->getPageLanguage()->getHtmlCode(),
+ 'pageLanguageDir' =>
$out->getTitle()->getPageLanguage()->getDir(),
);
return true;
@@ -140,18 +140,21 @@
* Adds extra variables to the global config
*/
public static function onResourceLoaderGetConfigVars( array &$vars ) {
- global $wgVisualEditorEnableEventLogging,
$wgVisualEditorPluginModules,
- $wgVisualEditorEnableExperimentalCode,
$wgVisualEditorTabLayout,
- $wgVisualEditorDisableForAnons,
$wgVisualEditorNamespaces;
+ global $wgVisualEditorDisableForAnons,
+ $wgVisualEditorEnableEventLogging,
+ $wgVisualEditorEnableExperimentalCode,
+ $wgVisualEditorNamespaces,
+ $wgVisualEditorPluginModules,
+ $wgVisualEditorTabLayout;
$vars['wgVisualEditorConfig'] = array(
- 'enableExperimentalCode' =>
$wgVisualEditorEnableExperimentalCode,
- 'enableEventLogging' =>
$wgVisualEditorEnableEventLogging,
- 'tabLayout' => $wgVisualEditorTabLayout,
'disableForAnons' => $wgVisualEditorDisableForAnons,
+ 'enableEventLogging' =>
$wgVisualEditorEnableEventLogging,
+ 'enableExperimentalCode' =>
$wgVisualEditorEnableExperimentalCode,
'namespaces' => $wgVisualEditorNamespaces,
- 'skins' => self::$supportedSkins,
'pluginModules' => $wgVisualEditorPluginModules,
+ 'skins' => self::$supportedSkins,
+ 'tabLayout' => $wgVisualEditorTabLayout,
);
return true;
--
To view, visit https://gerrit.wikimedia.org/r/77041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68f9258f739532ca30d2fdc91e62d6a2f87a5180
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
