From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 24 May 2019 14:56:29 +0000 (+0000)
Subject: Merge "Correct typo in Block::chooseBlock documentation"
X-Git-Tag: 1.34.0-rc.0~1599
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=b7e71525df3d401e3fd1e4815413610c65282465;hp=b18036c696cfd7e05e8dd5b36b62e1b90e85bb55

Merge "Correct typo in Block::chooseBlock documentation"
---

diff --git a/includes/Block.php b/includes/Block.php
index 9f7f77d439..9fcaaf7888 100644
--- 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 where 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