Ticket #7130: 7130.2.diff

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

@@ -132 +132 @@
  *
  * @since 2.1.0
  *
- * @param int $user_id ID of the user whose notifications are being fetched.
+ * @param int   $user_id ID of the user whose notifications are being fetched.
+ * @param array $args Additional arguments to expand notification query.
  * @return array $notifications Array of notifications for user.
  */
-function bp_notifications_get_all_notifications_for_user( $user_id = 0 ) {
+function bp_notifications_get_all_notifications_for_user( $user_id = 0, $args = array() ) {
 
         // Default to displayed user if no ID is passed.
         if ( empty( $user_id ) ) {
@@ -142 +143 @@
                 $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
         }
 
+        // For caching below.
+        ksort( $args );
+
+        $args_cache_key = '';
+        if ( ! empty( $args ) ) {
+                $args_cache_key = '_' . md5( json_encode( $args ) );
+        }
+
         // Get notifications out of the cache, or query if necessary.
-        $notifications = wp_cache_get( 'all_for_user_' . $user_id, 'bp_notifications' );
+        $notifications = wp_cache_get( 'all_for_user_' . $user_id . $args_cache_key, 'bp_notifications' );
         if ( false === $notifications ) {
-                $notifications = BP_Notifications_Notification::get( array(
-                        'user_id' => $user_id
+                $notifications = BP_Notifications_Notification::get( array_merge(
+                        $args, array( 'user_id' => $user_id )
                 ) );
-                wp_cache_set( 'all_for_user_' . $user_id, $notifications, 'bp_notifications' );
+                wp_cache_set( 'all_for_user_' . $user_id . $args_cache_key, $notifications, 'bp_notifications' );
         }
 
         /**
@@ -170 +179 @@
  * @param int    $user_id ID of the user whose notifications are being fetched.
  * @param string $format  Format of the returned values. 'string' returns HTML,
  *                        while 'object' returns a structured object for parsing.
+ * @param array  $args    Additional arguments to expand notification query.
  * @return mixed Object or array on success, false on failure.
  */
-function bp_notifications_get_notifications_for_user( $user_id, $format = 'string' ) {
+function bp_notifications_get_notifications_for_user( $user_id, $format = 'string', $args = array() ) {
 
         // Setup local variables.
         $bp = buddypress();
 
         // Get notifications (out of the cache, or query if necessary).
-        $notifications         = bp_notifications_get_all_notifications_for_user( $user_id );
+        $notifications         = bp_notifications_get_all_notifications_for_user( $user_id, $args );
         $grouped_notifications = array(); // Notification groups.
         $renderable            = array(); // Renderable notifications.