Ticket #5300: 5300.patch

bp-notifications/bp-notifications-classes.php

@@ -321 +321 @@
                         $where_conditions['is_new'] = "is_new = 0";
                 }
 
+                // active
+                if ( ! empty( $args['active'] ) ) {
+                        $active_components = array_keys( buddypress()->active_components );
+
+                        $ac_clean = array();
+                        foreach ( $active_components as $ac ) {
+                                $ac_clean[] = $wpdb->prepare( '%s', $ac );
+                        }
+
+                        $ac_in = implode( ',', $ac_clean );
+                        $where_conditions['active'] = "component_name IN ({$ac_in})";
+                }
+
                 // search_terms
                 if ( ! empty( $args['search_terms'] ) ) {
                         $search_terms = like_escape( esc_sql( $args['search_terms'] ) );
@@ -556 +569 @@
                         'component_name'    => false,
                         'component_action'  => false,
                         'is_new'            => true,
+                        'active'            => true,
                         'search_terms'      => '',
                         'order_by'          => false,
                         'sort_order'        => false,
@@ -578 +592 @@
                         'component_name'    => $r['component_name'],
                         'component_action'  => $r['component_action'],
                         'is_new'            => $r['is_new'],
+                        'active'            => $r['active'],
                         'search_terms'      => $r['search_terms'],
                 ) );
 
@@ -759 +774 @@
                 $r = wp_parse_args( $args, array(
                         'user_id'      => bp_loggedin_user_id(),
                         'is_new'       => true,
+                        'active'       => true,
                         'page'         => 1,
                         'per_page'     => 25,
                         'search_terms' => '',

bp-notifications/bp-notifications-template.php

@@ -244 +244 @@
                 $r = wp_parse_args( $args, array(
                         'user_id'      => 0,
                         'is_new'       => true,
+                        'active'       => true,
                         'page'         => 1,
                         'per_page'     => 25,
                         'order_by'     => 'date_notified',
@@ -282 +283 @@
                 $this->pag_num      = $pag_num;
                 $this->user_id      = $r['user_id'];
                 $this->is_new       = $r['is_new'];
+                $this->active       = $r['active'];
                 $this->search_terms = $r['search_terms'];
                 $this->page_arg     = $r['page_arg'];
                 $this->order_by     = $r['order_by'];
@@ -291 +293 @@
                 $notifications      = BP_Notifications_Notification::get_current_notifications_for_user( array(
                         'user_id'      => $this->user_id,
                         'is_new'       => $this->is_new,
+                        'active'       => $this->active,
                         'page'         => $this->pag_page,
                         'per_page'     => $this->pag_num,
                         'search_terms' => $this->search_terms,
@@ -481 +484 @@
         $r = wp_parse_args( $args, array(
                 'user_id'      => $user_id,
                 'is_new'       => $is_new,
+                'active'       => true,
                 'page'         => 1,
                 'per_page'     => 25,
                 'max'          => false,