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 "Don't armor french spaces before punctuation followed by word characters"
[lhc/web/wiklou.git]
/
includes
/
Block.php
diff --git
a/includes/Block.php
b/includes/Block.php
index
1d2e341
..
a7d89e2
100644
(file)
--- a/
includes/Block.php
+++ b/
includes/Block.php
@@
-1641,7
+1641,7
@@
class Block {
$reason,
$context->getRequest()->getIP(),
$this->getByName(),
$reason,
$context->getRequest()->getIP(),
$this->getByName(),
- $systemBlockType
!== null ? $systemBlockType :
$this->getId(),
+ $systemBlockType
??
$this->getId(),
$lang->formatExpiry( $this->mExpiry ),
(string)$intended,
$lang->userTimeAndDate( $this->mTimestamp, $context->getUser() ),
$lang->formatExpiry( $this->mExpiry ),
(string)$intended,
$lang->userTimeAndDate( $this->mTimestamp, $context->getUser() ),