Changeset 32364 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

05/06/2015 02:59:50 AM (11 years ago)

Author:

pento

Message:

WPDB: When checking that a string can be sent to MySQL, we shouldn't use mb_convert_encoding(), as it behaves differently to MySQL's character encoding conversion.

Props mdawaffe, pento, nbachiyski, jorbin, johnjamesjacoby, jeremyfelt.

See #32165.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (2 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -528 +528 @@
                 upgrade_420();
 
-        if ( $wp_current_db_version < 32308 )
+        if ( $wp_current_db_version < 32364 )
                 upgrade_430();
 
@@ -1447 +1447 @@
         global $wp_current_db_version, $wpdb;
 
-        if ( $wp_current_db_version < 32308 ) {
+        if ( $wp_current_db_version < 32364 ) {
                 $content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
-                if ( ! $content_length ) {
-                        $content_length = 65535;
-                }
+                if ( false === $content_length ) {
+                        $content_length = array(
+                                'type'   => 'byte',
+                                'length' => 65535,
+                        );
+                } elseif ( ! is_array( $content_length ) ) {
+                        $length = (int) $content_length > 0 ? (int) $content_length : 65535;
+                        $content_length = array(
+                                'type'   => 'byte',
+                                'length' => $length
+                        );
+                }
+
+                if ( 'byte' !== $content_length['type'] ) {
+                        // Sites with malformed DB schemas are on their own.
+                        return;
+                }
+
+                $allowed_length = intval( $content_length['length'] ) - 10;
 
                 $comments = $wpdb->get_results(
-                        "SELECT comment_ID FROM $wpdb->comments
-                        WHERE comment_date_gmt > '2015-04-26'
-                        AND CHAR_LENGTH( comment_content ) >= $content_length
-                        AND ( comment_content LIKE '%<%' OR comment_content LIKE '%>%' )"
+                        "SELECT `comment_ID` FROM `{$wpdb->comments}`
+                                WHERE `comment_date_gmt` > '2015-04-26'
+                                AND LENGTH( `comment_content` ) >= {$allowed_length}
+                                AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
                 );