jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/316836 )
Change subject: Provide context to ChangeTags::buildTagFilterSelector
......................................................................
Provide context to ChangeTags::buildTagFilterSelector
Bug: T105649
Change-Id: I5f44f4c054010c865ddb51e7d69107bdf2e88c00
---
M includes/actions/HistoryAction.php
M includes/htmlform/fields/HTMLTagFilter.php
M includes/logging/LogEventsList.php
M includes/specials/SpecialContributions.php
M includes/specials/SpecialRecentchanges.php
5 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/actions/HistoryAction.php
b/includes/actions/HistoryAction.php
index 9573cac..767a163 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -168,7 +168,7 @@
$year = $request->getInt( 'year' );
$month = $request->getInt( 'month' );
$tagFilter = $request->getVal( 'tagfilter' );
- $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
+ $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter,
false, $this->getContext() );
/**
* Option to show only revisions that have been (partially)
hidden via RevisionDelete
diff --git a/includes/htmlform/fields/HTMLTagFilter.php
b/includes/htmlform/fields/HTMLTagFilter.php
index e24541c..f58acbe 100644
--- a/includes/htmlform/fields/HTMLTagFilter.php
+++ b/includes/htmlform/fields/HTMLTagFilter.php
@@ -6,7 +6,8 @@
protected $tagFilter;
public function getTableRow( $value ) {
- $this->tagFilter = ChangeTags::buildTagFilterSelector( $value );
+ $this->tagFilter = ChangeTags::buildTagFilterSelector(
+ $value, false, $this->mParent->getContext() );
if ( $this->tagFilter ) {
return parent::getTableRow( $value );
}
@@ -14,7 +15,8 @@
}
public function getDiv( $value ) {
- $this->tagFilter = ChangeTags::buildTagFilterSelector( $value );
+ $this->tagFilter = ChangeTags::buildTagFilterSelector(
+ $value, false, $this->mParent->getContext() );
if ( $this->tagFilter ) {
return parent::getDiv( $value );
}
diff --git a/includes/logging/LogEventsList.php
b/includes/logging/LogEventsList.php
index 57a7597..6665336 100644
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@ -93,7 +93,7 @@
// For B/C, we take strings, but make sure they are converted...
$types = ( $types === '' ) ? [] : (array)$types;
- $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
+ $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter,
false, $this->getContext() );
$html = Html::hidden( 'title', $title->getPrefixedDBkey() );
diff --git a/includes/specials/SpecialContributions.php
b/includes/specials/SpecialContributions.php
index 3cd4d4d..40277ca 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -492,7 +492,8 @@
$form .= "\t" . Html::hidden( $name, $value ) . "\n";
}
- $tagFilter = ChangeTags::buildTagFilterSelector(
$this->opts['tagfilter'] );
+ $tagFilter = ChangeTags::buildTagFilterSelector(
+ $this->opts['tagfilter'], false, $this->getContext() );
if ( $tagFilter ) {
$filterSelection = Html::rawElement(
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 4569dd2..2a93159 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -501,7 +501,8 @@
$extraOpts['category'] = $this->categoryFilterForm(
$opts );
}
- $tagFilter = ChangeTags::buildTagFilterSelector(
$opts['tagfilter'] );
+ $tagFilter = ChangeTags::buildTagFilterSelector(
+ $opts['tagfilter'], false, $this->getContext() );
if ( count( $tagFilter ) ) {
$extraOpts['tagfilter'] = $tagFilter;
}
--
To view, visit https://gerrit.wikimedia.org/r/316836
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f44f4c054010c865ddb51e7d69107bdf2e88c00
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <matejsuchane...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Matěj Suchánek <matejsuchane...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
