jenkins-bot has submitted this change and it was merged.
Change subject: Fix transclusion of memberlist to still be memberlist.
......................................................................
Fix transclusion of memberlist to still be memberlist.
Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
---
M includes/content/CollaborationListContent.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index 824328d..b45422b 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -155,6 +155,12 @@
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList',
$listOptions['ismemberlist'] );
}
+ private function getOverrideOptions() {
+ $this->decode();
+ $opts = (array)$this->options;
+ return [ 'ismemberlist' => !empty( $opts['ismemberlist'] ) ];
+ }
+
private function getFullRenderListOptions() {
return $listOptions = [
'includeDesc' => true,
@@ -172,7 +178,7 @@
*/
public function convertToWikitext( Language $lang, $options = [] ) {
$this->decode();
- $options = $options + $this->getDefaultOptions();
+ $options = $options + $this->getOverrideOptions() +
$this->getDefaultOptions();
$maxItems = $options['maxItems'];
$includeDesc = $options['includeDesc'];
--
To view, visit https://gerrit.wikimedia.org/r/315140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ea9b9095c226ce065d6e5f45bbfa839eceae657
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
