jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367455 )
Change subject: HTMLForm: Show more options when incorrect displayFormat is set
......................................................................
HTMLForm: Show more options when incorrect displayFormat is set
Change-Id: I47a4684f01f5e30629e819403d7445479c4607da
---
M includes/htmlform/HTMLForm.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 61d0d89..d4351e0 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -400,7 +400,13 @@
if ( !in_array( $format, $this->availableDisplayFormats, true )
) {
throw new MWException( 'Display format must be one of '
.
- print_r( $this->availableDisplayFormats, true )
);
+ print_r(
+ array_merge(
+ $this->availableDisplayFormats,
+
$this->availableSubclassDisplayFormats
+ ),
+ true
+ ) );
}
// Evil hack for mobile :(
--
To view, visit https://gerrit.wikimedia.org/r/367455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47a4684f01f5e30629e819403d7445479c4607da
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
