Changeset 13397 for trunk/src/bp-notifications/classes/class-bp-notifications-notification.php

Timestamp:

01/07/2023 01:09:00 AM (4 years ago)

Author:

espellcaste

Message:

Notifications: returns the proper items when using the argument.

returns the notifications, together with the notification data, when the query is performed using the argument with the .

Closes ​https://github.com/buddypress/buddypress/pull/49
Fixes #8556

File:

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

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

@@ -667 +667 @@
          *     @type string       $order_by          Database column to order notifications by.
          *     @type string       $sort_order        Either 'ASC' or 'DESC'.
-         *     @type string       $order_by          Field to order results by.
-         *     @type string       $sort_order        ASC or DESC.
          *     @type int          $page              Number of the current page of results. Default:
          *                                           false (no pagination - all items).
@@ -693 +691 @@
 
                 // SELECT.
-                $select_sql = "SELECT *";
+                $select_sql = "SELECT n.*";
+
+                // FROM.
+                $from_sql = "FROM {$bp->notifications->table_name} n ";
+
+                // Append meta data to the results.
+                if ( isset( $r['meta_query'][0]['compare'] ) && 'EXISTS' === $r['meta_query'][0]['compare'] ) {
+                        $meta_table = $bp->notifications->table_name_meta;
+                        $select_sql = "SELECT n.*, {$meta_table}.id as meta_id, {$meta_table}.meta_key, {$meta_table}.meta_value";
+                }
+
+                // 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 );
+
+                // ORDER BY.
+                $order_sql  = self::get_order_by_sql( array(
+                        'order_by'   => $r['order_by'],
+                        'sort_order' => $r['sort_order']
+                ) );
+
+                // LIMIT %d, %d.
+                $pag_sql    = self::get_paged_sql( array(
+                        'page'     => $r['page'],
+                        'per_page' => $r['per_page']
+                ) );
+
+                // Concatenate query parts.
+                $sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} {$order_sql} {$pag_sql}";
+
+                // Perform query.
+                $results = $wpdb->get_results( $sql );
+
+                // Integer casting.
+                foreach ( $results as $key => $result ) {
+                        $results[$key]->id                = (int) $results[$key]->id;
+                        $results[$key]->user_id           = (int) $results[$key]->user_id;
+                        $results[$key]->item_id           = (int) $results[$key]->item_id;
+                        $results[$key]->secondary_item_id = (int) $results[$key]->secondary_item_id;
+                        $results[$key]->is_new            = (int) $results[$key]->is_new;
+                }
+
+                // Update meta cache.
+                if ( true === $r['update_meta_cache'] ) {
+                        bp_notifications_update_meta_cache( wp_list_pluck( $results, 'id' ) );
+                }
+
+                return $results;
+        }
+
+        /**
+         * Get a count of total notifications matching a set of arguments.
+         *
+         * @since 1.9.0
+         *
+         * @global wpdb $wpdb WordPress database object.
+         *
+         * @param array|string $args See {@link BP_Notifications_Notification::get()}.
+         * @return int Count of located items.
+         */
+        public static function get_total_count( $args ) {
+                global $wpdb;
+
+                // Parse the arguments.
+                $r = self::parse_args( $args );
+
+                // Load BuddyPress.
+                $bp = buddypress();
+
+                // METADATA.
+                $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
+
+                // SELECT.
+                $select_sql = "SELECT COUNT(*)";
 
                 // FROM.
@@ -714 +797 @@
                 ), $select_sql, $from_sql, $join_sql, $meta_query_sql );
 
-                // ORDER BY.
-                $order_sql  = self::get_order_by_sql( array(
-                        'order_by'   => $r['order_by'],
-                        'sort_order' => $r['sort_order']
-                ) );
-
-                // LIMIT %d, %d.
-                $pag_sql    = self::get_paged_sql( array(
-                        'page'     => $r['page'],
-                        'per_page' => $r['per_page']
-                ) );
-
-                // Concatenate query parts.
-                $sql = "{$select_sql} {$from_sql} {$join_sql} {$where_sql} {$order_sql} {$pag_sql}";
-
-                $results = $wpdb->get_results( $sql );
-
-                // Integer casting.
-                foreach ( $results as $key => $result ) {
-                        $results[$key]->id                = (int) $results[$key]->id;
-                        $results[$key]->user_id           = (int) $results[$key]->user_id;
-                        $results[$key]->item_id           = (int) $results[$key]->item_id;
-                        $results[$key]->secondary_item_id = (int) $results[$key]->secondary_item_id;
-                        $results[$key]->is_new            = (int) $results[$key]->is_new;
-                }
-
-                // Update meta cache.
-                if ( true === $r['update_meta_cache'] ) {
-                        bp_notifications_update_meta_cache( wp_list_pluck( $results, 'id' ) );
-                }
-
-                return $results;
-        }
-
-        /**
-         * Get a count of total notifications matching a set of arguments.
-         *
-         * @since 1.9.0
-         *
-         * @global wpdb $wpdb WordPress database object.
-         *
-         * @param array|string $args See {@link BP_Notifications_Notification::get()}.
-         * @return int Count of located items.
-         */
-        public static function get_total_count( $args ) {
-                global $wpdb;
-
-                // Parse the arguments.
-                $r = self::parse_args( $args );
-
-                // Load BuddyPress.
-                $bp = buddypress();
-
-                // METADATA.
-                $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
-
-                // SELECT.
-                $select_sql = "SELECT COUNT(*)";
-
-                // 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}";
@@ -810 +815 @@
          * @since 2.3.0
          *
+         * @global wpdb $wpdb WordPress database object.
+         *
          * @param  array $meta_query An array of meta_query filters. See the
          *                           documentation for WP_Meta_Query for details.
@@ -815 +822 @@
          */
         public static function get_meta_query_sql( $meta_query = array() ) {
+                global $wpdb;
 
                 // Default array keys & empty values.
@@ -827 +835 @@
                 }
 
+                $bp       = buddypress();
+                $meta_sql = new WP_Meta_Query( $meta_query );
+
                 // WP_Meta_Query expects the table name at $wpdb->notificationmeta.
-                $GLOBALS['wpdb']->notificationmeta = buddypress()->notifications->table_name_meta;
-
-                $n_meta_query = new WP_Meta_Query( $meta_query );
-                $meta_sql     = $n_meta_query->get_sql( 'notification', 'n', 'id' );
+                $wpdb->notificationmeta = $bp->notifications->table_name_meta;
+
+                $meta_sql = $meta_sql->get_sql( 'notification', 'n', 'id' );
 
                 // Strip the leading AND - it's handled in get().