wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-11-24 07:34:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use canonical name for NS_SPECIAL titles when checking the blacklist"

Browse source
This commit is contained in:
jenkins-bot 2017-08-25 15:50:22 +00:00 committed by Gerrit Code Review
parent d21e52c056 0de054cd79
commit 8850c1d0a3
3 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extension.json
View file

@ -72,8 +72,8 @@
"PopupsEventLogging": false,
"@PopupsStatsvSamplingRate": "Sampling rate for logging performance data to statsv.",
"PopupsStatsvSamplingRate": 0,
"@PopupsPageBlacklist": "Blacklisted pages are subject to the HTML cache policy of the wiki. A purge on a blacklisted page maybe needed to see the effect of this configuration variable.",
"PopupsPageBlacklist": [ "Special:UserLogin", "Special:CreateAccount" ]
"@PopupsPageBlacklist": "Blacklisted pages are subject to the HTML cache policy of the wiki. A purge on a blacklisted page maybe needed to see the effect of this configuration variable. Every blacklisted page should be defined by a canonical name, eg: Special:Userlogin",
"PopupsPageBlacklist": [ "Special:Userlogin", "Special:CreateAccount" ]
},
"ResourceModules": {
"ext.popups.images": {

14
includes/PopupsContext.php
View file

@ -177,9 +177,21 @@ class PopupsContext {
*/
public function isTitleBlacklisted( $title ) {
$blacklistedPages = $this->config->get( 'PopupsPageBlacklist' );
$canonicalTitle = $title->getRootTitle();
if ( $title->isSpecialPage() ) {
// it's special page, translate it to canonical name
list( $name, $subpage ) = \SpecialPageFactory::resolveAlias( $canonicalTitle->getText() );
if ( $name !== null ) {
$canonicalTitle = Title::newFromText( $name, NS_SPECIAL );
}
}
foreach ( $blacklistedPages as $page ) {
$blacklistedTitle = Title::newFromText( $page );
if ( $title->getRootTitle() == $blacklistedTitle->getRootTitle() ) {
if ( $canonicalTitle->equals( $blacklistedTitle ) ) {
return true;
}
}

24
tests/phpunit/PopupsContextTest.php
View file

@ -279,21 +279,39 @@ class PopupsContextTest extends MediaWikiTestCase {
}
/**
* @return array/
* @return array
*/
public function provideTestIsTitleBlacklisted() {
$blacklist = [ 'Special:UserLogin', 'Special:CreateAccount', 'User:A' ];
$blacklist = [ 'Special:Userlogin', 'Special:CreateAccount', 'User:A' ];
return [
[ $blacklist, Title::newFromText( 'Main_Page' ), false ],
[ $blacklist, Title::newFromText( 'Special:UserLogin' ), true ],
[ $blacklist, Title::newFromText( 'Special:CreateAccount' ), true ],
[ $blacklist, Title::newFromText( 'User:A' ), true ],
[ $blacklist, Title::newFromText( 'User:A/B' ), true ],
[ $blacklist, Title::newFromText( 'User:B' ), false ],
[ $blacklist, Title::newFromText( 'User:B/A' ), false ],
// test canonical name handling
[ $blacklist, Title::newFromText( 'Special:UserLogin' ), true ],
];
}
/**
* Test if special page in different language is blacklisted
*
* @covers ::isTitleBlacklisted
*/
public function testIsTranslatedTitleBlacklisted() {
$page = 'Specjalna:Preferencje';
$blacklist = [ $page ];
$this->setMwGlobals( [
"wgPopupsPageBlacklist" => $blacklist,
"wgLanguageCode" => "pl"
] );
$context = $this->getContext();
$this->assertEquals( true, $context->isTitleBlacklisted( Title::newFromText( $page ) ) );
}
/**
* @covers ::getDefaultIsEnabledState
*/