Changeset 32232 for trunk/src/wp-includes/wp-db.php

Timestamp:

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

Author:

pento

Message:

WPDB: When deciding if a query needs extra sanity checking based on collation, we can quickly return if it's a query that will never return user data.

Fixes #32029.

File:

• trunk/src/wp-includes/wp-db.php (modified) (3 diffs)

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

@@ -2400 +2400 @@
                 }
 
+                // We don't need to check the collation for queries that don't read data.
+                $query = ltrim( $query, "\r\n\t (" );
+                if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN)\s/i', $query ) ) {
+                        return true;
+                }
+
                 $table = $this->get_table_from_query( $query );
                 if ( ! $table ) {
@@ -2406 +2412 @@
 
                 $this->checking_collation = true;
-                $this->get_table_charset( $table );
+                $collation = $this->get_table_charset( $table );
                 $this->checking_collation = false;
+
+                // Tables with no collation, or latin1 only, don't need extra checking.
+                if ( false === $collation || 'latin1' === $collation ) {
+                        return true;
+                }
 
                 $table = strtolower( $table );
@@ -2414 +2425 @@
                 }
 
+                // If any of the columns don't have one of these collations, it needs more sanity checking.
                 foreach( $this->col_meta[ $table ] as $col ) {
                         if ( empty( $col->Collation ) ) {