jenkins-bot has submitted this change and it was merged.
Change subject: add missing title-param to abusefilter-log form
......................................................................
add missing title-param to abusefilter-log form
without it, you get redirected to the main page (index.php) when
$wgUsePathInfo = false; as no title-parameter is given.
also don't rely on __tostring.
Change-Id: I6b97d61c58b196c95836036219201cff8e2e0657
---
M Views/AbuseFilterViewExamine.php
M Views/AbuseFilterViewHistory.php
M Views/AbuseFilterViewList.php
M Views/AbuseFilterViewRevert.php
M Views/AbuseFilterViewTestBatch.php
M special/SpecialAbuseLog.php
6 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Views/AbuseFilterViewExamine.php b/Views/AbuseFilterViewExamine.php
index e191884..04c25be 100644
--- a/Views/AbuseFilterViewExamine.php
+++ b/Views/AbuseFilterViewExamine.php
@@ -40,7 +40,7 @@
$selector .= Xml::buildForm( $selectFields,
'abusefilter-examine-submit' );
$selector .= Html::hidden( 'submit', 1 );
- $selector .= Html::hidden( 'title', $this->getTitle( 'examine'
)->getPrefixedText() );
+ $selector .= Html::hidden( 'title', $this->getTitle( 'examine'
)->getPrefixedDBkey() );
$selector = Xml::tags( 'form',
array(
'action' => $this->getTitle( 'examine'
)->getLocalURL(),
diff --git a/Views/AbuseFilterViewHistory.php b/Views/AbuseFilterViewHistory.php
index 7662137..5cc39f5 100644
--- a/Views/AbuseFilterViewHistory.php
+++ b/Views/AbuseFilterViewHistory.php
@@ -53,7 +53,7 @@
$fields['abusefilter-history-select-user'] = Xml::input(
'user', 45, $user );
$filterForm = Xml::buildForm( $fields,
'abusefilter-history-select-submit' );
- $filterForm .= "\n" . Html::hidden( 'title', $this->getTitle(
"history/$filter" ) );
+ $filterForm .= "\n" . Html::hidden( 'title', $this->getTitle(
"history/$filter" )->getPrefixedDBkey() );
$filterForm = Xml::tags( 'form',
array(
'action' => $this->getTitle( "history/$filter"
)->getLocalURL(),
diff --git a/Views/AbuseFilterViewList.php b/Views/AbuseFilterViewList.php
index 463444e..a80d798 100644
--- a/Views/AbuseFilterViewList.php
+++ b/Views/AbuseFilterViewList.php
@@ -112,7 +112,7 @@
$fields['abusefilter-list-limit'] = $pager->getLimitSelect();
$options = Xml::buildForm( $fields,
'abusefilter-list-options-submit' );
- $options .= Html::hidden( 'title',
$this->getTitle()->getPrefixedText() );
+ $options .= Html::hidden( 'title',
$this->getTitle()->getPrefixedDBkey() );
$options = Xml::tags( 'form',
array(
'method' => 'get',
diff --git a/Views/AbuseFilterViewRevert.php b/Views/AbuseFilterViewRevert.php
index 773fcdc..941fa66 100644
--- a/Views/AbuseFilterViewRevert.php
+++ b/Views/AbuseFilterViewRevert.php
@@ -83,7 +83,7 @@
// Add a button down the bottom.
$confirmForm =
Html::hidden( 'editToken', $user->getEditToken(
"abusefilter-revert-$filter" ) ) .
- Html::hidden( 'title', $this->getTitle(
"revert/$filter" )->getPrefixedText() ) .
+ Html::hidden( 'title', $this->getTitle(
"revert/$filter" )->getPrefixedDBkey() ) .
Html::hidden( 'wpPeriodStart',
$this->origPeriodStart ) .
Html::hidden( 'wpPeriodEnd',
$this->origPeriodEnd ) .
Xml::inputLabel(
diff --git a/Views/AbuseFilterViewTestBatch.php
b/Views/AbuseFilterViewTestBatch.php
index 871ad31..3ee8e58 100644
--- a/Views/AbuseFilterViewTestBatch.php
+++ b/Views/AbuseFilterViewTestBatch.php
@@ -60,7 +60,7 @@
$output .= Xml::buildForm( $selectFields,
'abusefilter-test-submit' );
- $output .= Html::hidden( 'title', $this->getTitle( 'test'
)->getPrefixedText() );
+ $output .= Html::hidden( 'title', $this->getTitle( 'test'
)->getPrefixedDBkey() );
$output = Xml::tags( 'form',
array(
'action' => $this->getTitle( 'test'
)->getLocalURL(),
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 9d2623f..3aab66a 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -126,7 +126,8 @@
$output .= Xml::tags( 'form',
array( 'method' => 'get', 'action' =>
$this->getPageTitle()->getLocalURL() ),
- Xml::buildForm( $fields,
'abusefilter-log-search-submit' )
+ Xml::buildForm( $fields,
'abusefilter-log-search-submit' ) .
+ Html::hidden( 'title',
$this->getPageTitle()->getPrefixedDBkey() )
);
$output = Xml::tags( 'fieldset', null, $output );
--
To view, visit https://gerrit.wikimedia.org/r/181793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b97d61c58b196c95836036219201cff8e2e0657
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Se4598 <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Se4598 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
