Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/358360 )
Change subject: Use target instead title in SpecialPageData
......................................................................
Use target instead title in SpecialPageData
It confuses mediawiki and causes redirect loop
Bug: T163923
Change-Id: I29e0e6a61703cc04397205a3f7f38df5906622e1
---
M includes/linkeddata/PageDataRequestHandler.php
M tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
M tests/phpunit/includes/specials/SpecialPageDataTest.php
3 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/358360/1
diff --git a/includes/linkeddata/PageDataRequestHandler.php
b/includes/linkeddata/PageDataRequestHandler.php
index 3da20bf..8fc32b9 100644
--- a/includes/linkeddata/PageDataRequestHandler.php
+++ b/includes/linkeddata/PageDataRequestHandler.php
@@ -28,7 +28,7 @@
*/
public function canHandleRequest( $title, WebRequest $request ) {
if ( $title === '' || $title === null ) {
- if ( $request->getText( 'title', '' ) === '' ) {
+ if ( $request->getText( 'target', '' ) === '' ) {
return false;
}
}
@@ -57,7 +57,7 @@
$revision = 0;
- $title = $request->getText( 'title', $title );
+ $title = $request->getText( 'target', $title );
$revision = $request->getInt( 'oldid', $revision );
$revision = $request->getInt( 'revision', $revision );
diff --git a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
index eb67fae..56790e2 100644
--- a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
+++ b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
@@ -82,16 +82,16 @@
$cases[] = [ '', [], [], '!!', 400 ];
- $cases[] = [ '', [ 'title' => 'Helsinki' ], [], '!!', 303, [
'Location' => '!.+!' ] ];
+ $cases[] = [ '', [ 'target' => 'Helsinki' ], [], '!!', 303, [
'Location' => '!.+!' ] ];
$subpageCases = [];
foreach ( $cases as $c ) {
$case = $c;
$case[0] = '';
- if ( isset( $case[1]['title'] ) ) {
- $case[0] .= $case[1]['title'];
- unset( $case[1]['title'] );
+ if ( isset( $case[1]['target'] ) ) {
+ $case[0] .= $case[1]['target'];
+ unset( $case[1]['target'] );
}
$subpageCases[] = $case;
@@ -101,7 +101,7 @@
$cases[] = [
'',
- [ 'title' => 'Helsinki' ],
+ [ 'target' => 'Helsinki' ],
[ 'Accept' => 'text/HTML' ],
'!!',
303,
@@ -111,7 +111,7 @@
$cases[] = [
'',
[
- 'title' => 'Helsinki',
+ 'target' => 'Helsinki',
'revision' => '4242',
],
[ 'Accept' => 'text/HTML' ],
diff --git a/tests/phpunit/includes/specials/SpecialPageDataTest.php
b/tests/phpunit/includes/specials/SpecialPageDataTest.php
index 7569d63..2566875 100644
--- a/tests/phpunit/includes/specials/SpecialPageDataTest.php
+++ b/tests/phpunit/includes/specials/SpecialPageDataTest.php
@@ -30,7 +30,7 @@
$cases['Only title specified'] = [
'',
- [ 'title' => 'Helsinki' ],
+ [ 'target' => 'Helsinki' ],
[],
'!!',
303,
@@ -54,7 +54,7 @@
$cases['Accept only HTML'] = [
'',
- [ 'title' => 'Helsinki' ],
+ [ 'target' => 'Helsinki' ],
[ 'Accept' => 'text/HTML' ],
'!!',
303,
@@ -64,7 +64,7 @@
$cases['Accept only HTML with revid'] = [
'',
[
- 'title' => 'Helsinki',
+ 'target' => 'Helsinki',
'revision' => '4242',
],
[ 'Accept' => 'text/HTML' ],
--
To view, visit https://gerrit.wikimedia.org/r/358360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29e0e6a61703cc04397205a3f7f38df5906622e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
