Changeset 26307

Timestamp:

11/21/2013 07:30:35 PM (13 years ago)

Author:

wonderboymusic

Message:

In update_meta_cache(), ensure that meta is always stored in the same order. Removes an unnecessary $wpdb->prepare statement. Adds unit test.

Props mattheu.
Fixes #25511.

Location:

trunk

Files:

• src/wp-includes/meta.php (modified) (1 diff)
• tests/phpunit/tests/meta.php (modified) (1 diff)

trunk/src/wp-includes/meta.php

@@ -559 +559 @@
 
         // Get meta info
-        $id_list = join(',', $ids);
-        $meta_list = $wpdb->get_results( $wpdb->prepare("SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list)",
-                $meta_type), ARRAY_A );
+        $id_list = join( ',', $ids );
+        $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
+        $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
 
         if ( !empty($meta_list) ) {

trunk/tests/phpunit/tests/meta.php

@@ -172 +172 @@
                 $this->assertEquals( 2, substr_count( $posts->request, 'CAST(' ) );
         }
+
+        function test_meta_cache_order_asc() {
+                $post_id = $this->factory->post->create();
+                $colors = array( 'red', 'blue', 'yellow', 'green' );
+                foreach ( $colors as $color )
+                        add_post_meta( $post_id, 'color', $color );
+
+                foreach ( range( 1, 10 ) as $i ) {
+                        $meta = get_post_meta( $post_id, 'color' );
+                        $this->assertEquals( $meta, $colors );
+
+                        if ( 0 === $i % 2 )
+                                wp_cache_delete( $post_id, 'post_meta' );
+                }
+        }
 }