Changeset 32387 for branches/4.1/src/wp-admin/includes/upgrade.php

Timestamp:

05/06/2015 07:06:02 PM (11 years ago)

Author:

mdawaffe

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.

Merge of [32364] to the 4.1 branch.

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

See #32165.

File:

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

branches/4.1/src/wp-admin/includes/upgrade.php

@@ -443 +443 @@
         upgrade_400();
 
-    if ( $wp_current_db_version < 30134 )
-        upgrade_414();
+    if ( $wp_current_db_version < 30135 )
+        upgrade_415();
 
     maybe_disable_link_manager();
@@ -1335 +1335 @@
  * Execute changes made in WordPress 4.1.4.
  *
- * @since 4.1.3
+ * @since 4.1.4
  */
 function upgrade_414() {
+}
+
+/**
+ * Execute changes made in WordPress 4.1.5.
+ *
+ * @since 4.1.5
+ */
+function upgrade_415() {
     global $wp_current_db_version, $wpdb;
 
-    if ( $wp_current_db_version < 30134 ) {
+    if ( $wp_current_db_version < 30135 ) {
         $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 '%>%' )"
         );