Changeset 32235

Timestamp:

04/21/2015 06:18:58 AM (11 years ago)

Author:

pento

Message:

WPDB: When deciding if a query needs extra sanity checking based on collation, return early when we can. Merges [32232] and [32233] to the 4.0 branch.

See #32029.

File:

• branches/4.0/src/wp-includes/wp-db.php (modified) (4 diffs)

branches/4.0/src/wp-includes/wp-db.php

@@ -2372 +2372 @@
                         return true;
                 }
+
+                // 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;
+                }
+
+                // All-ASCII queries don't need extra checking.
+                if ( $this->check_ascii( $query ) ) {
+                        return true;
+                }
+
                 $table = $this->get_table_from_query( $query );
                 if ( ! $table ) {
@@ -2378 +2390 @@
 
                 $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 );
@@ -2386 +2403 @@
                 }
 
+                // 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 ) ) {
@@ -2413 +2431 @@
          *                        remove invalid characters, a {@see WP_Error} object is returned.
          */
+                // If any of the columns don't have one of these collations, it needs more sanity checking.
         protected function strip_invalid_text( $data ) {
                 // Some multibyte character sets that we can check in PHP.