Changeset 42058 for branches/4.7/tests/phpunit/tests/comment/query.php

Timestamp:

10/31/2017 12:33:25 PM (8 years ago)

Author:

pento

Message:

Database: Restore numbered placeholders in wpdb::prepare().

[41496] removed support for numbered placeholders in queries send through wpdb::prepare(), which, despite being undocumented, were quite commonly used.

This change restores support for numbered placeholders (as well as a subset of placeholder formatting), while also adding extra checks to ensure the correct number of arguments are being passed to wpdb::prepare(), given the number of placeholders.

Merges [41662], [42056] to the 4.7 branch.
See #41925.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/comment/query.php (modified) (2 diffs)

branches/4.7/tests/phpunit/tests/comment/query.php

@@ -1219 +1219 @@
      */
     public function test_search_int_0_should_not_be_ignored() {
+        global $wpdb;
         $q = new WP_Comment_Query();
         $q->query( array(
             'search' => 0,
         ) );
-        $this->assertContains( "comment_author LIKE '%0%'", $q->request );
+        $this->assertContains( "comment_author LIKE '%0%'", $wpdb->remove_placeholder_escape( $q->request ) );
     }
 
@@ -1230 +1231 @@
      */
     public function test_search_string_0_should_not_be_ignored() {
+        global $wpdb;
         $q = new WP_Comment_Query();
         $q->query( array(
             'search' => '0',
         ) );
-        $this->assertContains( "comment_author LIKE '%0%'", $q->request );
+        $this->assertContains( "comment_author LIKE '%0%'", $wpdb->remove_placeholder_escape( $q->request ) );
     }