Changeset 32403 for branches/4.0/src/wp-includes/wp-db.php

Timestamp:

05/06/2015 08:03:22 PM (9 years ago)

Author:

ocean90

Message:

WPDB: When sanity checking query character sets, there's no need to check queries that don't return user data.

Merges [32374] to the 4.0 branch.

props pento.
see #32104.

File:

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

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

@@ -2502 +2502 @@
         // 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 ) ) {
+        if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query ) ) {
             return true;
         }
@@ -2713 +2713 @@
      */
     protected function strip_invalid_text_from_query( $query ) {
+        // We don't need to check the collation for queries that don't read data.
+        $trimmed_query = ltrim( $query, "\r\n\t (" );
+        if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query ) ) {
+            return $query;
+        }
+
         $table = $this->get_table_from_query( $query );
         if ( $table ) {