dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typehint against IDatabase in special pages
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialBlock.php
diff --git
a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index
9e218b6
..
b79a482
100644
(file)
--- a/
includes/specials/SpecialBlock.php
+++ b/
includes/specials/SpecialBlock.php
@@
-21,9
+21,9
@@
* @ingroup SpecialPage
*/
* @ingroup SpecialPage
*/
-use MediaWiki\Block\BlockRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\Block\Restriction\NamespaceRestriction;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\Block\Restriction\NamespaceRestriction;
+use MediaWiki\MediaWikiServices;
/**
* A special page that allows users with 'block' right to block users from
/**
* A special page that allows users with 'block' right to block users from
@@
-949,8
+949,9
@@
class SpecialBlock extends FormSpecialPage {
$currentBlock->isSitewide( $block->isSitewide() );
// Set the block id of the restrictions.
$currentBlock->isSitewide( $block->isSitewide() );
// Set the block id of the restrictions.
+ $blockRestrictionStore = MediaWikiServices::getInstance()->getBlockRestrictionStore();
$currentBlock->setRestrictions(
$currentBlock->setRestrictions(
-
BlockRestriction::
setBlockId( $currentBlock->getId(), $restrictions )
+
$blockRestrictionStore->
setBlockId( $currentBlock->getId(), $restrictions )
);
}
);
}
@@
-1075,7
+1076,7
@@
class SpecialBlock extends FormSpecialPage {
*
* @todo strtotime() only accepts English strings. This means the expiry input
* can only be specified in English.
*
* @todo strtotime() only accepts English strings. This means the expiry input
* can only be specified in English.
- * @see https://
secure
.php.net/manual/en/function.strtotime.php
+ * @see https://
www
.php.net/manual/en/function.strtotime.php
*
* @param string $expiry Whatever was typed into the form
* @return string|bool Timestamp or 'infinity' or false on error.
*
* @param string $expiry Whatever was typed into the form
* @return string|bool Timestamp or 'infinity' or false on error.
@@
-1125,9
+1126,11
@@
class SpecialBlock extends FormSpecialPage {
} elseif ( is_string( $target ) ) {
$target = User::newFromName( $target );
}
} elseif ( is_string( $target ) ) {
$target = User::newFromName( $target );
}
- if ( $performer->
isBlocked
() ) {
+ if ( $performer->
getBlock
() ) {
if ( $target instanceof User && $target->getId() == $performer->getId() ) {
# User is trying to unblock themselves
if ( $target instanceof User && $target->getId() == $performer->getId() ) {
# User is trying to unblock themselves
+ // @TODO Ensure that the block does not apply to the `unblockself`
+ // right.
if ( $performer->isAllowed( 'unblockself' ) ) {
return true;
# User blocked themselves and is now trying to reverse it
if ( $performer->isAllowed( 'unblockself' ) ) {
return true;
# User blocked themselves and is now trying to reverse it