Ticket #40871: 40871.diff

src/wp-admin/includes/class-wp-community-events.php

@@ -210 +210 @@
         }
 
         /**
-         * Determines the user's actual IP address and attempts to partially
-         * anonymize an IP address by converting it to a network ID.
-         *
-         * Geolocating the network ID usually returns a similar location as the
-         * actual IP, but provides some privacy for the user.
+         * Determines the user's actual IP address.
          *
          * $_SERVER['REMOTE_ADDR'] cannot be used in all cases, such as when the user
          * is making their request through a proxy, or when the web server is behind
@@ -222 +218 @@
          * than the user's actual address.
          *
          * Modified from http://stackoverflow.com/a/2031935/450127, MIT license.
-         * Modified from https://github.com/geertw/php-ip-anonymizer, MIT license.
          *
          * SECURITY WARNING: This function is _NOT_ intended to be used in
          * circumstances where the authenticity of the IP address matters. This does
@@ -232 +227 @@
          * @access protected
          * @since 4.8.0
          *
-         * @return false|string The anonymized address on success; the given address
-         *                      or false on failure.
+         * @return false|string The IP address on success, or false on failure.
          */
         public static function get_unsafe_client_ip() {
                 $client_ip = false;
@@ -263 +257 @@
                         }
                 }
 
-                // These functions are not available on Windows until PHP 5.3.
-                if ( function_exists( 'inet_pton' ) && function_exists( 'inet_ntop' ) ) {
-                        if ( 4 === strlen( inet_pton( $client_ip ) ) ) {
-                                $netmask = '255.255.255.0'; // ipv4.
-                        } else {
-                                $netmask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000'; // ipv6.
-                        }
-
-                        $client_ip = inet_ntop( inet_pton( $client_ip ) & inet_pton( $netmask ) );
-                }
-
                 return $client_ip;
         }