jenkins-bot has submitted this change and it was merged.
Change subject: Do not load CX modules outside Special:CX
......................................................................
Do not load CX modules outside Special:CX
Redo I45815806b0527555a80379e09489f8268f630f8b
Somehow it was overwritten in master
Change-Id: I6ff9dbb419f43a442300f4a00366c7985136a182
---
M ContentTranslation.hooks.php
M specials/SpecialContentTranslation.php
2 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ContentTranslation.hooks.php b/ContentTranslation.hooks.php
index bda6e29..953ed97 100644
--- a/ContentTranslation.hooks.php
+++ b/ContentTranslation.hooks.php
@@ -16,7 +16,7 @@
* Hook: BeforePageDisplay
*/
public static function addModules( $out, $skin ) {
- global $wgContentTranslationEventLogging,
$wgContentTranslationExperimentalFeatures;
+ global $wgContentTranslationEventLogging;
$title = $out->getTitle();
$user = $out->getUser();
@@ -44,14 +44,6 @@
'schema.ContentTranslation',
'ext.cx.eventlogging',
) );
- }
-
- if ( $wgContentTranslationExperimentalFeatures ) {
- // WYSIWYGEditor
- $out->addModules( 'ext.cx.editor.medium' );
- } else {
- // Just ContentEditable
- $out->addModules( 'ext.cx.editor' );
}
return true;
diff --git a/specials/SpecialContentTranslation.php
b/specials/SpecialContentTranslation.php
index b50b5c1..4f13c76 100644
--- a/specials/SpecialContentTranslation.php
+++ b/specials/SpecialContentTranslation.php
@@ -22,11 +22,21 @@
}
public function execute( $parameters ) {
+ global $wgContentTranslationExperimentalFeatures;
+
$out = $this->getOutput();
$skin = $this->getSkin();
$out->addModuleStyles( 'mediawiki.ui.button' );
$out->addModules( 'ext.cx.base' );
+ if ( $wgContentTranslationExperimentalFeatures ) {
+ // WYSIWYGEditor
+ $out->addModules( 'ext.cx.editor.medium' );
+ } else {
+ // Just ContentEditable
+ $out->addModules( 'ext.cx.editor' );
+ }
+
$this->setHeaders();
$out->setArticleBodyOnly( true );
--
To view, visit https://gerrit.wikimedia.org/r/148953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ff9dbb419f43a442300f4a00366c7985136a182
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
