Changeset 9613

Timestamp:

03/11/2015 04:26:05 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Notifications: incorporate meta query logic into get_total_count() method. See #6257.

File:

• trunk/src/bp-notifications/classes/class-bp-notifications-notification.php (modified) (4 diffs)

trunk/src/bp-notifications/classes/class-bp-notifications-notification.php

@@ -570 +570 @@
 
                 return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->core->table_name_notifications} WHERE id = %d AND user_id = %d", $notification_id, $user_id ) );
+        }
+
+        /**
+         * Parse notifications query arguments
+         *
+         * @since BuddyPress 2.3.0
+         *
+         * @param  mixed $args
+         * @return array
+         */
+        public static function parse_args( $args = '' ) {
+                return wp_parse_args( $args, array(
+                        'id'                => false,
+                        'user_id'           => false,
+                        'item_id'           => false,
+                        'secondary_item_id' => false,
+                        'component_name'    => bp_notifications_get_registered_components(),
+                        'component_action'  => false,
+                        'is_new'            => true,
+                        'search_terms'      => '',
+                        'order_by'          => false,
+                        'sort_order'        => false,
+                        'page'              => false,
+                        'per_page'          => false,
+                        'meta_query'        => false,
+                        'date_query'        => false,
+                        'update_meta_cache' => true
+                ) );
         }
 
@@ -613 +641 @@
 
                 // Parse the arguments
-                $r = wp_parse_args( $args, array(
-                        'id'                => false,
-                        'user_id'           => false,
-                        'item_id'           => false,
-                        'secondary_item_id' => false,
-                        'component_name'    => bp_notifications_get_registered_components(),
-                        'component_action'  => false,
-                        'is_new'            => true,
-                        'search_terms'      => '',
-                        'order_by'          => false,
-                        'sort_order'        => false,
-                        'page'              => false,
-                        'per_page'          => false,
-                        'meta_query'        => false,
-                        'date_query'        => false,
-                        'update_meta_cache' => true,
-                        'count_total'       => false,
-                ) );
+                $r = self::parse_args( $args );
 
                 // Get BuddyPress
@@ -669 +680 @@
                 $pag_sql    = self::get_paged_sql( array(
                         'page'     => $r['page'],
-                        'per_page' => $r['per_page'],
+                        'per_page' => $r['per_page']
                 ) );
 
@@ -692 +703 @@
                 global $wpdb;
 
-                /**
-                 * Default component_name to active_components
-                 *
-                 * @see http://buddypress.trac.wordpress.org/ticket/5300
-                 */
-                $args = wp_parse_args( $args, array(
-                        'component_name' => bp_notifications_get_registered_components()
-                ) );
+                // Parse the arguments
+                $r = self::parse_args( $args );
 
                 // Load BuddyPress
                 $bp = buddypress();
 
-                // Build the query
+                // METADATA
+                $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
+
+                // SELECT
                 $select_sql = "SELECT COUNT(*)";
-                $from_sql   = "FROM {$bp->notifications->table_name}";
-                $where_sql  = self::get_where_sql( $args );
-                $sql        = "{$select_sql} {$from_sql} {$where_sql}";
+
+                // FROM
+                $from_sql   = "FROM {$bp->notifications->table_name} n ";
+
+                // JOIN
+                $join_sql   = $meta_query_sql['join'];
+
+                // WHERE
+                $where_sql  = self::get_where_sql( array(
+                        'id'                => $r['id'],
+                        'user_id'           => $r['user_id'],
+                        'item_id'           => $r['item_id'],
+                        'secondary_item_id' => $r['secondary_item_id'],
+                        'component_name'    => $r['component_name'],
+                        'component_action'  => $r['component_action'],
+                        'is_new'            => $r['is_new'],
+                        'search_terms'      => $r['search_terms'],
+                        'date_query'        => $r['date_query']
+                ), $select_sql, $from_sql, $join_sql, $meta_query_sql );
+
+                // Concatenate query parts
+                $sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql}";
 
                 // Return the queried results