Changeset 37565

Timestamp:

05/25/2016 06:29:01 PM (8 years ago)

Author:

boonebgorges

Message:

In get_bookmarks(), don't cache if 'orderby=rand'.

Props lukecavanagh, prettyboymp, c3mdigital, MikeHansenMe.
Fixes #18356.

Location:

trunk

Files:

• src/wp-includes/bookmark.php (modified) (2 diffs)
• tests/phpunit/tests/bookmark/getBookmarks.php (modified) (1 diff)

trunk/src/wp-includes/bookmark.php

@@ -129 +129 @@
 
     $key = md5( serialize( $r ) );
-    if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
+    $cache = false;
+    if ( 'rand' !== $r['orderby'] && $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
         if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
             $bookmarks = $cache[ $key ];
@@ -286 +287 @@
     $results = $wpdb->get_results( $query );
 
-    $cache[ $key ] = $results;
-    wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+    if ( 'rand()' !== $orderby ) {
+        $cache[ $key ] = $results;
+        wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+    }
 
     /** This filter is documented in wp-includes/bookmark.php */

trunk/tests/phpunit/tests/bookmark/getBookmarks.php

@@ -48 +48 @@
         $this->assertTrue( $num_queries < $wpdb->num_queries );
     }
+
+    /**
+     * @ticket 18356
+     */
+    public function test_orderby_rand_should_not_be_cached() {
+        global $wpdb;
+
+        $bookmarks = self::factory()->bookmark->create_many( 2 );
+
+        $found1 = get_bookmarks( array(
+            'orderby' => 'rand',
+        ) );
+
+        $num_queries = $wpdb->num_queries;
+
+        $found2 = get_bookmarks( array(
+            'orderby' => 'rand',
+        ) );
+
+        // equal sets != same order
+        $this->assertEqualSets( $found1, $found2 );
+        $this->assertTrue( $num_queries < $wpdb->num_queries );
+    }
 }