dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b18036c
)
Merge "Correct typo in Block::chooseBlock documentation"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Fri, 24 May 2019 14:56:29 +0000
(14:56 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Fri, 24 May 2019 14:56:29 +0000
(14:56 +0000)
includes/Block.php
patch
|
blob
|
history
diff --git
a/includes/Block.php
b/includes/Block.php
index
9f7f77d
..
9fcaaf7
100644
(file)
--- a/
includes/Block.php
+++ b/
includes/Block.php
@@
-1208,7
+1208,7
@@
class Block extends AbstractBlock {
* - Other softblocks are chosen over autoblocks
* - If there are multiple exact or range blocks at the same level, the one chosen
* is random
- * This should be used when $blocks w
h
ere retrieved from the user's IP address
+ * This should be used when $blocks were retrieved from the user's IP address
* and $ipChain is populated from the same IP address information.
*
* @param array $blocks Array of Block objects