Changeset 13288

Timestamp:

03/07/2024 02:18:00 AM (2 years ago)

Author:

dd32

Message:

Registration: Fix the IP lookup query on query failure.

See [13216].

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login

Files:

• admin/class-user-registrations-list-table.php (modified) (1 diff)
• functions-registration.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/admin/class-user-registrations-list-table.php

@@ -383 +383 @@
                         $ip = $meta->{$field . '_ip'};
 
-                        $meta->{$field . '_ip_country'} ??= ( is_callable( 'WordPressdotorg\GeoIP\query' ) ? ' ' . \WordPressdotorg\GeoIP\query( $ip, 'country_short' ) : '' );
+                        if ( empty( $meta->{$field . '_ip_country'} ) ) {
+                                $meta->{$field . '_ip_country'} = ( is_callable( 'WordPressdotorg\GeoIP\query' ) ? \WordPressdotorg\GeoIP\query( $ip, 'country_short' ) : '' );
+                        }
 
                         $ips[] = $ip . ' ' . $meta->{$field . '_ip_country'};

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions-registration.php

@@ -83 +83 @@
                 'meta' => $meta + array(
                         'registration_ip'  => $_SERVER['REMOTE_ADDR'], // Spam & fraud control. Will be discarded after the account is created.
-                        'registration_ip_country' => ( is_callable( 'WordPressdotorg\GeoIP\query' ) ? ' ' . \WordPressdotorg\GeoIP\query( $_SERVER['REMOTE_ADDR'], 'country_short' ) : '' )
+                        'registration_ip_country' => ( is_callable( 'WordPressdotorg\GeoIP\query' ) ? \WordPressdotorg\GeoIP\query( $_SERVER['REMOTE_ADDR'], 'country_short' ) : '' )
                 ),
                 'scores' => array(
@@ -337 +337 @@
         $pending_user['created_date']                 = gmdate( 'Y-m-d H:i:s' );
         $pending_user['meta']['confirmed_ip']         = $_SERVER['REMOTE_ADDR'];
-        $pending_user['meta']['confirmed_ip_country'] = ( is_callable( 'WordPressdotorg\GeoIP\query' ) ? ' ' . \WordPressdotorg\GeoIP\query( $_SERVER['REMOTE_ADDR'], 'country_short' ): '' );
+        $pending_user['meta']['confirmed_ip_country'] = ( is_callable( 'WordPressdotorg\GeoIP\query' ) ? \WordPressdotorg\GeoIP\query( $_SERVER['REMOTE_ADDR'], 'country_short' ): '' );
 
         // reCaptcha v3 logging.