Changeset 32233

Timestamp:

04/21/2015 05:23:44 AM (10 years ago)

Author:

pento

Message:

WPDB: When deciding if a query needs extra sanity checking based on collation, we can quickly return if the query is entirely ASCII characters.

See #32029.

Location:

trunk

Files:

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

trunk/src/wp-includes/wp-db.php

@@ -2406 +2406 @@
         }
 
+        // All-ASCII queries don't need extra checking.
+        if ( $this->check_ascii( $query ) ) {
+            return true;
+        }
+
         $table = $this->get_table_from_query( $query );
         if ( ! $table ) {

trunk/tests/phpunit/tests/db/charset.php

@@ -504 +504 @@
 
             $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
-            $value[2] = "SELECT * FROM $this_table_name";
+            $value[2] = "SELECT * FROM $this_table_name WHERE a='\xf0\x9f\x98\x88'";
             $value[3] = "DROP TABLE IF EXISTS $this_table_name";
             $value[4] = array(
+                "SELECT * FROM $this_table_name WHERE a='foo'",
                 "SHOW FULL TABLES LIKE $this_table_name",
                 "DESCRIBE $this_table_name",