jenkins-bot has submitted this change and it was merged.
Change subject: Make HTMLTagFilter disappear totally when $wgUseTagFilter =
false
......................................................................
Make HTMLTagFilter disappear totally when $wgUseTagFilter = false
Previously the label displayed but the input field didn't.
Bug: T78432
Change-Id: Ia84ac611f76c98495a5b3f90c0ce01b6e1e404a3
---
M includes/htmlform/HTMLTagFilter.php
1 file changed, 21 insertions(+), 5 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLTagFilter.php
b/includes/htmlform/HTMLTagFilter.php
index eac9423..8075de5 100644
--- a/includes/htmlform/HTMLTagFilter.php
+++ b/includes/htmlform/HTMLTagFilter.php
@@ -1,14 +1,30 @@
<?php
/**
- * Wrapper for ChgangeTags::buildTagFilterSelector to use in HTMLForm
+ * Wrapper for ChangeTags::buildTagFilterSelector to use in HTMLForm
*/
class HTMLTagFilter extends HTMLFormField {
+ protected $tagFilter;
+
+ function getTableRow( $value ) {
+ $this->tagFilter = ChangeTags::buildTagFilterSelector( $value );
+ if ( $this->tagFilter ) {
+ return parent::getTableRow( $value );
+ }
+ return '';
+ }
+
+ function getDiv( $value ) {
+ $this->tagFilter = ChangeTags::buildTagFilterSelector( $value );
+ if ( $this->tagFilter ) {
+ return parent::getDiv( $value );
+ }
+ return '';
+ }
+
function getInputHTML( $value ) {
- $tagFilter = ChangeTags::buildTagFilterSelector( $value );
- if ( $tagFilter ) {
- list( $tagFilterLabel, $tagFilterSelector ) =
$tagFilter;
+ if ( $this->tagFilter ) {
// we only need the select field, HTMLForm should
handle the label
- return $tagFilterSelector;
+ return $this->tagFilter[1];
}
return '';
}
--
To view, visit https://gerrit.wikimedia.org/r/188550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia84ac611f76c98495a5b3f90c0ce01b6e1e404a3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Se4598 <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
