Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ApiQuerySiteinfo: Fix "rightsinfo"/"url" when $wgRightsPage is set"

Browse source
This commit is contained in:
jenkins-bot 2021-11-09 13:15:25 +00:00 committed by Gerrit Code Review
commit 6e4f771462
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/api/ApiQuerySiteinfo.php
View file

@ -769,9 +769,10 @@ class ApiQuerySiteinfo extends ApiQueryBase {
protected function appendRightsInfo( $property ) { protected function appendRightsInfo( $property ) {
$config = $this->getConfig(); $config = $this->getConfig();
$rightsPage = $config->get( 'RightsPage' ); $rightsPage = $config->get( 'RightsPage' );
if ( is_string( $rightsPage ) ) { // The default value is null, but the installer sets it to empty string
if ( strlen( $rightsPage ) ) {
$title = Title::newFromText( $rightsPage ); $title = Title::newFromText( $rightsPage );
$url = wfExpandUrl( $title, PROTO_CURRENT ); $url = wfExpandUrl( $title->getLinkURL(), PROTO_CURRENT );
} else { } else {
$title = false; $title = false;
$url = $config->get( 'RightsUrl' ); $url = $config->get( 'RightsUrl' );

18
tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
View file

@ -477,15 +477,27 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
'wgRightsUrl' => $url, 'wgRightsUrl' => $url,
'wgRightsText' => $text, 'wgRightsText' => $text,
] ); ] );
$this->assertSame( $this->assertSame(
[ 'url' => $expectedUrl, 'text' => $expectedText ], [ 'url' => $expectedUrl, 'text' => $expectedText ],
$this->doQuery( 'rightsinfo' ) $this->doQuery( 'rightsinfo' )
); );
// The installer sets these options to empty string if not specified otherwise,
// test that this behaves the same as null.
$this->setMwGlobals( [
'wgRightsPage' => $page ?? '',
'wgRightsUrl' => $url ?? '',
'wgRightsText' => $text ?? '',
] );
$this->assertSame(
[ 'url' => $expectedUrl, 'text' => $expectedText ],
$this->doQuery( 'rightsinfo' ),
'empty string behaves the same as null'
);
} }
public function rightsInfoProvider() { public function rightsInfoProvider() {
$textUrl = wfExpandUrl( Title::newFromText( 'License' ), PROTO_CURRENT ); $textUrl = wfExpandUrl( Title::newFromText( 'License' )->getLinkURL(), PROTO_CURRENT );
$url = 'http://license.example/'; $url = 'http://license.example/';
return [ return [
@ -499,7 +511,7 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
'Page and text' => [ 'License', null, '!!!', $textUrl, '!!!' ], 'Page and text' => [ 'License', null, '!!!', $textUrl, '!!!' ],
'Page and URL and text' => [ 'License', $url, '!!!', $textUrl, '!!!' ], 'Page and URL and text' => [ 'License', $url, '!!!', $textUrl, '!!!' ],
'Pagename "0"' => [ '0', null, null, 'Pagename "0"' => [ '0', null, null,
wfExpandUrl( Title::newFromText( '0' ), PROTO_CURRENT ), '0' ], wfExpandUrl( Title::newFromText( '0' )->getLinkURL(), PROTO_CURRENT ), '0' ],
'URL "0"' => [ null, '0', null, '0', '' ], 'URL "0"' => [ null, '0', null, '0', '' ],
'Text "0"' => [ null, null, '0', '', '0' ], 'Text "0"' => [ null, null, '0', '', '0' ],
]; ];