Changeset 6434

Timestamp:

05/26/2017 10:14:20 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Queries: Update orderby clauses of last-id queries to ensure more accurate results, specifically for imported forums and posts where IDs and post_date columns might be inverted.

Also update a few tests to be less cranky with exact array results.

Props thebrandonallen. Fixes #3108.

Location:

trunk

Files:

• src/includes/common/functions.php (modified) (1 diff)
• src/includes/forums/functions.php (modified) (2 diffs)
• tests/phpunit/testcases/topics/functions/status.php (modified) (2 diffs)

trunk/src/includes/common/functions.php

@@ -1500 +1500 @@
         'post_status' => $post_status,
         'post_type'   => $post_type,
+        'orderby'     => array(
+            'post_date' => 'DESC',
+            'ID'        => 'DESC'
+        ),
 
         // Maybe change these later

trunk/src/includes/forums/functions.php

@@ -2166 +2166 @@
                 $types['meta_query'] = array(
                     'key'     => '_bbp_forum_id',
-                    'value'   => $forum_ids,
+                    'value'   => $types['string'],
                     'type'    => 'NUMERIC',
                     'compare' => $compare
@@ -2358 +2358 @@
         'post_status'     => bbp_get_public_status_id(),
         'post_type'       => bbp_get_reply_post_type(),
+        'orderby'         => array(
+            'post_date' => 'DESC',
+            'ID'        => 'DESC'
+        ),
 
         // Maybe change these later

trunk/tests/phpunit/testcases/topics/functions/status.php

@@ -148 +148 @@
 
         $topic_meta_pre_spammed_replies = get_post_meta( $t, '_bbp_pre_spammed_replies', true );
-        $this->assertEquals( array( $r[1], $r[0] ), $topic_meta_pre_spammed_replies );
+        $this->assertEqualSets( array( $r[1], $r[0] ), $topic_meta_pre_spammed_replies );
 
         $topic_spam_meta_status = get_post_meta( $t, '_bbp_spam_meta_status', true );
@@ -215 +215 @@
 
         $topic_meta_pre_spammed_replies = get_post_meta( $t, '_bbp_pre_spammed_replies', true );
-        $this->assertEquals( array( $r[1], $r[0] ), $topic_meta_pre_spammed_replies );
+        $this->assertEqualSets( array( $r[1], $r[0] ), $topic_meta_pre_spammed_replies );
 
         foreach ( $r as $reply ) {