Changeset 7150

Timestamp:

11/05/2020 05:57:36 PM (4 years ago)

Author:

johnjamesjacoby

Message:

Meta: always query meta_value by string, not by integer.

This commit swaps "%d" for "%s" when querying by meta_value, even with numeric values. This allows for custom index alterations to perform as intended, and also more closely follows how WordPress core itself operates.

In trunk, for 2.7. Fixes #3408.

Location:

trunk/src/includes

Files:

• admin/tools/upgrade.php (modified) (3 diffs)
• common/functions.php (modified) (1 diff)

trunk/src/includes/admin/tools/upgrade.php

@@ -427 +427 @@
 
             // Skip if already exists
-            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d", $post_id, $new_key, $meta->user_id ) ) ) {
+            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $new_key, $meta->user_id ) ) ) {
                 continue;
             }
@@ -487 +487 @@
 
             // Skip if already exists
-            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d", $post_id, $new_key, $meta->user_id ) ) ) {
+            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $new_key, $meta->user_id ) ) ) {
                 continue;
             }
@@ -547 +547 @@
 
             // Skip if already exists
-            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %d", $post_id, $new_key, $meta->user_id ) ) ) {
+            if ( $bbp_db->get_var( $bbp_db->prepare( "SELECT COUNT(*) FROM {$bbp_db->postmeta} WHERE post_id = %d AND meta_key = %s AND meta_value = %s", $post_id, $new_key, $meta->user_id ) ) ) {
                 continue;
             }

trunk/src/includes/common/functions.php

@@ -1738 +1738 @@
                             ON p.ID = pm.post_id
                             AND pm.meta_key = %s
-                    WHERE pm.meta_value = %d
+                    WHERE pm.meta_value = %s
                     GROUP BY p.post_status, p.post_type";