Merge "RELEASE-NOTES: Follow-up on I28092eeb8dec058c5dba2fb63"

diff --git a/includes/Block.php b/includes/Block.php
index 37b9ce5..3f17d84 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -2132,17 +2132,17 @@ class Block {
         * Check if the block should be tracked with a cookie.
         *
         * @since 1.33
-        * @param bool $isIpUser The user is logged out
+        * @param bool $isAnon The user is logged out
         * @return bool The block should be tracked with a cookie
         */
-       public function shouldTrackWithCookie( $isIpUser ) {
+       public function shouldTrackWithCookie( $isAnon ) {
                $config = RequestContext::getMain()->getConfig();
                switch ( $this->getType() ) {
                        case self::TYPE_IP:
                        case self::TYPE_RANGE:
-                               return $isIpUser && $config->get( 'CookieSetOnIpBlock' );
+                               return $isAnon && $config->get( 'CookieSetOnIpBlock' );
                        case self::TYPE_USER:
-                               return !$isIpUser && $config->get( 'CookieSetOnAutoblock' ) && $this->isAutoblocking();
+                               return !$isAnon && $config->get( 'CookieSetOnAutoblock' ) && $this->isAutoblocking();
                        default:
                                return false;
                }