Ticket #18356: 18356.4.diff

src/wp-includes/bookmark.php

@@ -128 +128 @@
         $r = wp_parse_args( $args, $defaults );
 
         $key = md5( serialize( $r ) );
-        if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
+        if ( 'rand' == $orderby ) {
+                if ( $results = wp_cache_get( $key, 'get_bookmarks_rand' ) ) {
+                        return apply_filters( 'get_bookmarks', $results, $r );
+                }
+        } elseif ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
                 if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
                         $bookmarks = $cache[ $key ];
                         /**
@@ -285 +289 @@
 
         $results = $wpdb->get_results( $query );
 
-        $cache[ $key ] = $results;
-        wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+        if ( 'rand()' == $orderby ) {
+                /**
+                 * Filter the expiration time of bookmarks when randomly ordered.
+                 *
+                 * @since 4.4.0
+                 *
+                 * @param $rand_ttl Expiration time, in seconds. Default 60.
+                 */
+                $rand_ttl = apply_filters( 'get_bookmarks_rand_ttl', MINUTE_IN_SECONDS );
+                wp_cache_set( $key, $results, 'get_bookmarks_rand', $rand_ttl );
+        } else {
+                $cache[ $key ] = $results;
+                wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+        }
 
         /** This filter is documented in wp-includes/bookmark.php */
         return apply_filters( 'get_bookmarks', $results, $r );