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 "OOUI forms: Remove infusable = false"
[lhc/web/wiklou.git]
/
includes
/
Block.php
diff --git
a/includes/Block.php
b/includes/Block.php
index
04a5a15
..
060eebd
100644
(file)
--- a/
includes/Block.php
+++ b/
includes/Block.php
@@
-1036,10
+1036,7
@@
class Block {
* @return int (0 for foreign users)
*/
public function getBy() {
* @return int (0 for foreign users)
*/
public function getBy() {
- $blocker = $this->getBlocker();
- return ( $blocker instanceof User )
- ? $blocker->getId()
- : 0;
+ return $this->getBlocker()->getId();
}
/**
}
/**
@@
-1048,10
+1045,7
@@
class Block {
* @return string
*/
public function getByName() {
* @return string
*/
public function getByName() {
- $blocker = $this->getBlocker();
- return ( $blocker instanceof User )
- ? $blocker->getName()
- : (string)$blocker; // username
+ return $this->getBlocker()->getName();
}
/**
}
/**