Rename $search to $engine to match hook docs for SpecialSearchSetupEngine

[lhc/web/wiklou.git] / includes / Block.php

diff --git a/includes/Block.php b/includes/Block.php
index 5b0d256..0f5e8dd 100644 (file)
--- 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
         */