* Set the block ID
*
* @param int $blockId
- * @return int
+ * @return self
*/
private function setId( $blockId ) {
$this->mId = (int)$blockId;
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;
}
* - 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
*/