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

Merge "Remove Target/User validation from Block::appliesToUsertalk()"

Browse source
This commit is contained in:
jenkins-bot 2019-02-25 21:11:19 +00:00 committed by Gerrit Code Review
commit b361df2f1d
1 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/Block.php
View file

@ -1912,18 +1912,18 @@ class Block {
* they can never edit it. (Ideally the flag would be stored as
* null in these cases, but the database field isn't nullable.)
*
* This method does not validate that the passed in talk page belongs to the
* block target since the target (an IP) might not be the same as the user's
* talk page (if they are logged in).
*
* @since 1.33
* @param Title|null $usertalk The user's user talk page. If null,
* and if the target is a User, the target's userpage is used
* @return bool The user can edit their talk page
*/
public function appliesToUsertalk( Title $usertalk = null ) {
$target = $this->target;
$targetIsUser = $target instanceof User;
$targetName = $targetIsUser ? $target->getName() : $target;
if ( !$usertalk ) {
if ( $targetIsUser ) {
if ( $this->target instanceof User ) {
$usertalk = $this->target->getTalkPage();
} else {
throw new InvalidArgumentException(
@ -1938,28 +1938,6 @@ class Block {
);
}
switch ( $this->type ) {
case self::TYPE_USER:
case self::TYPE_IP:
if ( $usertalk->getText() !== $targetName ) {
throw new InvalidArgumentException(
'$usertalk must be a talk page for the block target'
);
}
break;
case self::TYPE_RANGE:
if ( !IP::isInRange( $usertalk->getText(), $target ) ) {
throw new InvalidArgumentException(
'$usertalk must be a talk page for an IP within the block target range'
);
}
break;
default:
throw new LogicException(
'Cannot determine validity of $usertalk for this type of block'
);
}
if ( !$this->isSitewide() ) {
if ( $this->appliesToPage( $usertalk->getArticleID() ) ) {
return true;