Changeset 33479 for branches/4.1/src/wp-includes/wp-db.php

Timestamp:

07/29/2015 06:45:12 AM (11 years ago)

Author:

pento

Message:

WPDB: ::strip_text_from_query() doesn't pass a length to ::strip_invalid_text(), which was causing queries to fail when they contained characters that needed to be sanity checked by MySQL.

Props dd32, mdawaffe, pento.

Merges [33310] to the 4.1 branch.

See #32279.

File:

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

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

@@ -2571 +2571 @@
             if ( is_array( $value['length'] ) ) {
                 $length = $value['length']['length'];
+                $truncate_by_byte_length = 'byte' === $value['length']['type'];
             } else {
                 $length = false;
+                // Since we have no length, we'll never truncate.
+                // Initialize the variable to false. true would take us
+                // through an unnecessary (for this case) codepath below.
+                $truncate_by_byte_length = false;
             }
 
@@ -2584 +2589 @@
                 continue;
             }
-
-            $truncate_by_byte_length = 'byte' === $value['length']['type'];
 
             $needs_validation = true;
@@ -2660 +2663 @@
                     }
 
-                    $queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING {$this->charset} )", $value['value'], $value['length']['length'] );
+                    if ( is_array( $value['length'] ) ) {
+                        $queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING {$this->charset} )", $value['value'], $value['length']['length'] );
+                    } else if ( 'binary' !== $charset ) {
+                        // If we don't have a length, there's no need to convert binary - it will always return the same result.
+                        $queries[ $col ] = $this->prepare( "CONVERT( CONVERT( %s USING $charset ) USING {$this->charset} )", $value['value'] );
+                    }
 
                     unset( $data[ $col ]['db'] );