jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329632 )
Change subject: Fix CodeEditor JS error on CollaborationHub edit page
......................................................................
Fix CodeEditor JS error on CollaborationHub edit page
We were incorrectly telling CodeEditor this is JSON content when
it was actually are custom edit form, which was causing CodeEditor
to barf when WikiEditor extension was enabled.
Bug: T151701
Change-Id: I593f66582e9d50b1c3e5acfbc63ebceae1c6be3a
---
M CollaborationKit.hooks.php
1 file changed, 1 insertion(+), 5 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index a1e16e1..cbabf2c 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -66,7 +66,7 @@
$ckitModels = [ 'CollaborationHubContent',
'CollaborationListContent' ];
$req = RequestContext::getMain()->getRequest();
// Kind of hacky use of globals.
- if ( $contentModel === 'CollaborationListContent' ) {
+ if ( in_array( $contentModel, $ckitModels ) ) {
if ( $req->getVal( 'format' ) === 'application/json' ) {
$lang = 'json';
return true;
@@ -77,10 +77,6 @@
$lang = null;
return false;
}
- }
- if ( $contentModel === 'CollaborationHubContent' ) {
- $lang = 'json';
- return true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/329632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I593f66582e9d50b1c3e5acfbc63ebceae1c6be3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
