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
Merge "Add missing type to @param documentation"
[lhc/web/wiklou.git]
/
includes
/
Block.php
diff --git
a/includes/Block.php
b/includes/Block.php
index
2ca56a5
..
843ea54
100644
(file)
--- a/
includes/Block.php
+++ b/
includes/Block.php
@@
-44,40
+44,40
@@
class Block {
public $mParentBlockId;
/** @var int */
public $mParentBlockId;
/** @var int */
- pr
otected
$mId;
+ pr
ivate
$mId;
/** @var bool */
/** @var bool */
- pr
otected
$mFromMaster;
+ pr
ivate
$mFromMaster;
/** @var bool */
/** @var bool */
- pr
otected
$mBlockEmail;
+ pr
ivate
$mBlockEmail;
/** @var bool */
/** @var bool */
- pr
otected
$mDisableUsertalk;
+ pr
ivate
$mDisableUsertalk;
/** @var bool */
/** @var bool */
- pr
otected
$mCreateAccount;
+ pr
ivate
$mCreateAccount;
/** @var User|string */
/** @var User|string */
- pr
otected
$target;
+ pr
ivate
$target;
/** @var int Hack for foreign blocking (CentralAuth) */
/** @var int Hack for foreign blocking (CentralAuth) */
- pr
otected
$forcedTargetID;
+ pr
ivate
$forcedTargetID;
/** @var int Block::TYPE_ constant. Can only be USER, IP or RANGE internally */
/** @var int Block::TYPE_ constant. Can only be USER, IP or RANGE internally */
- pr
otected
$type;
+ pr
ivate
$type;
/** @var User */
/** @var User */
- pr
otected
$blocker;
+ pr
ivate
$blocker;
/** @var bool */
/** @var bool */
- pr
otected
$isHardblock;
+ pr
ivate
$isHardblock;
/** @var bool */
/** @var bool */
- pr
otected
$isAutoblocking;
+ pr
ivate
$isAutoblocking;
/** @var string|null */
/** @var string|null */
- pr
otected
$systemBlockType;
+ pr
ivate
$systemBlockType;
# TYPE constants
const TYPE_USER = 1;
# TYPE constants
const TYPE_USER = 1;
@@
-1501,7
+1501,7
@@
class Block {
return $id;
}
$hmac = MWCryptHash::hmac( $id, $secretKey, false );
return $id;
}
$hmac = MWCryptHash::hmac( $id, $secretKey, false );
- $cookieValue =
$id . '!' . $hmac;
+ $cookieValue = $id . '!' . $hmac;
return $cookieValue;
}
return $cookieValue;
}