Changeset 13649

Timestamp:

11/23/2023 04:08:04 AM (20 months ago)

Author:

imath

Message:

Avoid a PHP warning in bp_core_current_user_ip()

Props slaFFik

Fixes #9028
See #9002
Closes ​https://github.com/buddypress/buddypress/pull/195

Location:

trunk/src/bp-core

Files:

• bp-core-moderation.php (modified) (1 diff)
• classes/class-bp-admin.php (modified) (4 diffs)

trunk/src/bp-core/bp-core-moderation.php

@@ -331 +331 @@
  */
 function bp_core_current_user_ip() {
-    $retval = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
+    $retval = '';
+    if ( isset( $_SERVER['REMOTE_ADDR'] ) ) {
+        $retval = preg_replace( '/[^0-9a-fA-F:., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) );
+    }
 
     /**

trunk/src/bp-core/classes/class-bp-admin.php

@@ -824 +824 @@
                         </h2>
                         <p>
-                            <?php esc_html_e( 'Among the 90 changes introduced in 12.0.0, the BP Rewrites API is a massive revolution opening the way for a progressive BuddyPress evolution.', 'buddypress' ); ?>
+                            <?php esc_html_e( 'Among the 100 changes introduced in 12.0.0, the BP Rewrites API is a massive revolution opening the way for a progressive BuddyPress evolution.', 'buddypress' ); ?>
                             <?php esc_html_e( 'Based on 10 years of experience gained through hard work, we are beginning to reimagine what it means to organize and manage communities within WordPess.', 'buddypress' ); ?>
                             <?php esc_html_e( 'Here are the immediate benefits of the new BP Rewrites API :', 'buddypress' ); ?>
@@ -943 +943 @@
                         printf(
                             /* translators: 1: heart dashicons. 2: BP Credits screen url. 3: number of BuddyPress contributors to this version. */
-                            _n( 'Built with %1$s by <a href="%2$s">%3$d volunteer</a>.', 'Built with %1$s by <a href="%2$s">%3$d volunteers</a>.', 31, 'buddypress' ),
+                            _n( 'Built with %1$s by <a href="%2$s">%3$d volunteer</a>.', 'Built with %1$s by <a href="%2$s">%3$d volunteers</a>.', 32, 'buddypress' ),
                             '<span class="dashicons dashicons-heart"></span>',
                             esc_url( bp_get_admin_url( 'admin.php?page=bp-credits' ) ),
-                            number_format_i18n( 31 )
+                            number_format_i18n( 32 )
                         );
                         ?>
@@ -1066 +1066 @@
                 </li>
                 <li class="wp-person" id="wp-person-slaffik">
-                    <a class="web" href="https://profiles.wordpress.org/r-a-y/"><img alt="" class="gravatar" src="//www.gravatar.com/avatar/61fb07ede3247b63f19015f200b3eb2c?s=120">
+                    <a class="web" href="https://profiles.wordpress.org/slaffik/"><img alt="" class="gravatar" src="//www.gravatar.com/avatar/61fb07ede3247b63f19015f200b3eb2c?s=120">
                     Slava Abakumov</a>
                     <span class="title"><?php esc_html_e( 'Core Developer', 'buddypress' ); ?></span>
@@ -1167 +1167 @@
                 <a href="https://profiles.wordpress.org/shailu25/">Shail Mehta (shailu25)</a>,
                 <a href="https://profiles.wordpress.org/shawfactor/">shawfactor</a>,
+                <a href="https://profiles.wordpress.org/slaffik/">Slava Abakumov (slaFFik)</a>,
                 <a href="https://profiles.wordpress.org/sjregan/">sjregan</a>,
                 <a href="https://profiles.wordpress.org/teeboy4real/">teeboy4real</a>,