Changeset 7547

Timestamp:

11/09/2013 03:46:13 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Ensure when users with bp_moderate capability navigate to other user's notifications, the correct notifications are shown. See #5148.

File:

• trunk/bp-notifications/bp-notifications-template.php (modified) (2 diffs)

trunk/bp-notifications/bp-notifications-template.php

@@ -234 +234 @@
         // Setup variables
         $this->pag_page     = isset( $_GET[ $r['page_arg'] ] ) ? intval( $_GET[ $r['page_arg'] ] ) : $r['page'];
-        $this->pag_num      = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $r['per_page'];
+        $this->pag_num      = isset( $_GET['num']            ) ? intval( $_GET['num']            ) : $r['per_page'];
         $this->user_id      = $r['user_id'];
         $this->is_new       = $r['is_new'];
@@ -415 +415 @@
     }
 
+    // Get the user ID
+    if ( bp_displayed_user_id() ) {
+        $user_id = bp_displayed_user_id();
+    } else {
+        $user_id = bp_loggedin_user_id();
+    }
+
     // Parse the args
     $r = wp_parse_args( $args, array(
-        'user_id'      => bp_loggedin_user_id(),
+        'user_id'      => $user_id,
         'is_new'       => $is_new,
         'page'         => 1,