X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FBlock.php;h=0f5e8dd316b131bd55c32c6012f645df21aa3676;hb=a52f0fdb944dc72762abb05518befafdfe031a86;hp=5b0d25611e509c7ea561d83e85b2d9eb71174f7f;hpb=34d2b3aa238754621462cfaa10aa45c7751bf9a8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Block.php b/includes/Block.php
index 5b0d25611e..0f5e8dd316 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -972,7 +972,7 @@ class Block extends AbstractBlock {
 	 * Set the block ID
 	 *
 	 * @param int $blockId
-	 * @return int
+	 * @return self
 	 */
 	private function setId( $blockId ) {
 		$this->mId = (int)$blockId;
@@ -1154,7 +1154,7 @@ class Block extends AbstractBlock {
 			if ( !IP::isValid( $ipaddr ) ) {
 				continue;
 			}
-			# Don't check trusted IPs (includes local squids which will be in every request)
+			# Don't check trusted IPs (includes local CDNs which will be in every request)
 			if ( $proxyLookup->isTrustedProxy( $ipaddr ) ) {
 				continue;
 			}
@@ -1208,14 +1208,14 @@ 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
 	 * @param array $ipChain List of IPs (strings). This is used to determine how "close"
 	 *     a block is to the server, and if a block matches exactly, or is in a range.
 	 *     The order is furthest from the server to nearest e.g., (Browser, proxy1, proxy2,
-	 *     local-squid, ...)
+	 *     local-cdn, ...)
 	 * @throws MWException
 	 * @return Block|null The "best" block from the list
 	 */