Sbisson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399638 )
Change subject: RecentChangesLinked: Include title without subpage in form
......................................................................
RecentChangesLinked: Include title without subpage in form
When the 'title' hidden field contains the subpage, the 'target'
input field is never taken into account since the subpage always
has takes precedence in ChangesListSpecialPage->setup()
Bug: T183437
Change-Id: Id39d1887719ecb6900b25fefbb133dff9c4d0456
---
M includes/specialpage/ChangesListSpecialPage.php
M includes/specials/SpecialRecentchangeslinked.php
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/399638/1
diff --git a/includes/specialpage/ChangesListSpecialPage.php
b/includes/specialpage/ChangesListSpecialPage.php
index 65a03eb..ef10c5a 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -677,7 +677,7 @@
// but are still valid and requested in
the URL
$query = array_merge(
$this->getRequest()->getValues(), $query );
unset( $query[ 'title' ] );
- $this->getOutput()->redirect(
$this->getPageTitle()->getCanonicalURL( $query ) );
+ $this->getOutput()->redirect(
$this->getPageTitle( true )->getCanonicalURL( $query ) );
} else {
// There's a default, but the version
is not 2, and the server can't
// actually recognize the query itself.
This happens if it is before
diff --git a/includes/specials/SpecialRecentchangeslinked.php
b/includes/specials/SpecialRecentchangeslinked.php
index 9e0daf5..8a4db6b 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -306,7 +306,9 @@
* @since 1.23
*/
public function getPageTitle( $subpage = false ) {
- $subpage = $subpage ? $subpage : $this->rclTarget;
+ if ( $subpage === true ) {
+ $subpage = $this->rclTarget;
+ }
return parent::getPageTitle( $subpage );
}
--
To view, visit https://gerrit.wikimedia.org/r/399638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id39d1887719ecb6900b25fefbb133dff9c4d0456
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
