wikimedia/mediawiki-extensions-CodeEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeEditor synced 2024-11-27 16:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert "Directly use $wgTitle instead of relying on getContextTitle fallback""

Browse source
This commit is contained in:
jenkins-bot 2020-01-01 23:31:56 +00:00 committed by Gerrit Code Review
parent d5ac28ddad 212477a083
commit d75911245e
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.phpcs.xml
View file

@ -1,8 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<ruleset> <ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
<exclude name="MediaWiki.Usage.DeprecatedGlobalVariables.Deprecated$wgTitle" />
</rule>
<file>.</file> <file>.</file>
<arg name="extensions" value="php,php5,inc" /> <arg name="extensions" value="php,php5,inc" />
<arg name="encoding" value="UTF-8" /> <arg name="encoding" value="UTF-8" />

5
includes/CodeEditorHooks.php
View file

@ -41,12 +41,11 @@ class CodeEditorHooks {
* @throws ErrorPageError * @throws ErrorPageError
*/ */
public static function editPageShowEditFormInitial( EditPage $editpage, OutputPage $output ) { public static function editPageShowEditFormInitial( EditPage $editpage, OutputPage $output ) {
global $wgTitle; $title = $editpage->getContextTitle();
$model = $editpage->contentModel; $model = $editpage->contentModel;
$format = $editpage->contentFormat; $format = $editpage->contentFormat;
$lang = self::getPageLanguage( $wgTitle, $model, $format ); $lang = self::getPageLanguage( $title, $model, $format );
if ( $lang && $output->getUser()->getOption( 'usebetatoolbar' ) ) { if ( $lang && $output->getUser()->getOption( 'usebetatoolbar' ) ) {
$output->addModules( 'ext.codeEditor' ); $output->addModules( 'ext.codeEditor' );
$output->addJsConfigVars( 'wgCodeEditorCurrentLanguage', $lang ); $output->addJsConfigVars( 'wgCodeEditorCurrentLanguage', $lang );