jenkins-bot has submitted this change and it was merged.
Change subject: Use page ContentModel to choose editor language
......................................................................
Use page ContentModel to choose editor language
Bug: 42593
Change-Id: I894afc3119719bfb3feff2677df12842bdf47ef8
---
M CodeEditor.hooks.php
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CodeEditor.hooks.php b/CodeEditor.hooks.php
index 1e0cd30..470f82e 100644
--- a/CodeEditor.hooks.php
+++ b/CodeEditor.hooks.php
@@ -4,8 +4,14 @@
static function getPageLanguage( $title ) {
global $wgCodeEditorEnableCore;
- // Try CSS/JS
- if( $wgCodeEditorEnableCore && ( $title->isCssOrJsPage() ||
$title->isCssJsSubpage() ) ) {
+ if ( $wgCodeEditorEnableCore && method_exists( $title,
"getContentModel" ) ) {
+ if ( $title->getContentModel() ===
CONTENT_MODEL_JAVASCRIPT ) {
+ return 'javascript';
+ } else if ( $title->getContentModel() ===
CONTENT_MODEL_CSS ) {
+ return 'css';
+ }
+ } elseif( $wgCodeEditorEnableCore && ( $title->isCssOrJsPage()
|| $title->isCssJsSubpage() ) ) {
+ // This block is deprecated. Remove after 1.23 release
if( preg_match( '/\.js$/', $title->getText() ) )
return 'javascript';
if( preg_match( '/\.css$/', $title->getText() ) )
--
To view, visit https://gerrit.wikimedia.org/r/104721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I894afc3119719bfb3feff2677df12842bdf47ef8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
