Changeset 10653

Timestamp:

02/10/2021 08:15:21 AM (4 years ago)

Author:

dd32

Message:

Support Forums: Also Viewing: Don't show the current user as viewing the page, and importantly, add an oxford comma.

See #2552.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing

Files:

• wporg-bbp-also-viewing.js (modified) (1 diff)
• wporg-bbp-also-viewing.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.js

@@ -57 +57 @@
             if ( userCount > 1 ) {
                 userlistPretty = __( '%1$s and %2$s' )
-                .replace( '%1$s', userList.slice( 0, -1 ).join( ', ' ) )
+                .replace( '%1$s', userList.slice( 0, -1 ).join( ', ' ) + ( userCount > 2 ? ',' : '' ) )
                 .replace( '%2$s', userList.slice( -1 ) );
             } else {

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-also-viewing/wporg-bbp-also-viewing.php

@@ -258 +258 @@
     $users = get_currently_viewing( $page );
     foreach ( $users as $i => $u ) {
-        if ( $u->user_id == get_current_user_id() ) {
+        if ( $u['user_id'] == get_current_user_id() ) {
             unset( $users[ $i ] );
         }