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

Set API limits for page restrictions to 10

Browse source 
Bug: T212142
Change-Id: Ide0f2f86df2101194155be53a4b9012ddefbbcaf
This commit is contained in:
Thalia 2018-12-17 17:53:27 +00:00
parent 55016be767
commit 9c8e1aaa4c
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/api/ApiBlock.php
View file

@ -57,20 +57,6 @@ class ApiBlock extends ApiBase {
$editingRestriction = 'sitewide';
$pageRestrictions = '';
if ( $this->getConfig()->get( 'EnablePartialBlocks' ) ) {
if ( $params['pagerestrictions'] ) {
$count = count( $params['pagerestrictions'] );
if ( $count > 10 ) {
$this->dieWithError(
$this->msg(
'apierror-integeroutofrange-abovebotmax',
'pagerestrictions',
10,
$count
)
);
}
}
if ( $params['partial'] ) {
$editingRestriction = 'partial';
}
@ -207,6 +193,8 @@ class ApiBlock extends ApiBase {
$params['partial'] = false;
$params['pagerestrictions'] = [
ApiBase::PARAM_ISMULTI => true,
ApiBase::PARAM_ISMULTI_LIMIT1 => 10,
ApiBase::PARAM_ISMULTI_LIMIT2 => 10,
];
}

3
tests/phpunit/includes/api/ApiBlockTest.php
View file

@ -274,7 +274,8 @@ class ApiBlockTest extends ApiTestCase {
/**
* @expectedException ApiUsageException
* @expectedExceptionMessage "pagerestrictions" may not be over 10 (set to 11) for bots or sysops.
* @expectedExceptionMessage Too many values supplied for parameter "pagerestrictions". The
* limit is 10.
*/
public function testBlockingToManyRestrictions() {
$this->setMwGlobals( [