Ticket #7130: 7130-counts.diff

src/bp-notifications/bp-notifications-cache.php

@@ -43 +43 @@
  */
 function bp_notifications_clear_all_for_user_cache( $user_id = 0 ) {
         wp_cache_delete( 'all_for_user_' . $user_id, 'bp_notifications' );
+        wp_cache_delete( $user_id, 'bp_notifications_unread_count' );
 }
 
 /**

src/bp-notifications/bp-notifications-functions.php

@@ -607 +607 @@
  * @return int Unread notification count.
  */
 function bp_notifications_get_unread_notification_count( $user_id = 0 ) {
-        $notifications = bp_notifications_get_all_notifications_for_user( $user_id );
-        $count         = ! empty( $notifications ) ? count( $notifications ) : 0;
+        if ( empty( $user_id ) ) {
+                $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+        }
+
+        $count = wp_cache_get( $user_id, 'bp_notifications_unread_count' );
+        if ( false === $count ) {
+                $count = BP_Notifications_Notification::get_total_count( array(
+                        'user_id' => $user_id,
+                        'is_new'  => true,
+                ) );
+                wp_cache_set( $user_id, $count, 'bp_notifications_unread_count' );
+        }
 
         /**
          * Filters the count of unread notification items for a user.

tests/phpunit/testcases/notifications/functions.php

@@ -35 +35 @@
                 ) );
 
                 $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+                $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
         }
 
         /**
@@ -61 +62 @@
                 BP_Notifications_Notification::delete( array( 'id' => $n1, ) );
 
                 $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+                $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
         }
 
         /**
@@ -91 +93 @@
                 );
 
                 $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+                $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
         }
 
         /**
@@ -121 +124 @@
                 );
 
                 $this->assertFalse( wp_cache_get( 'all_for_user_' . $u, 'bp_notifications' ) );
+                $this->assertFalse( wp_cache_get( $u, 'bp_notifications_unread_count' ) );
         }
 
         /**