Changeset 32431

Timestamp:

05/06/2015 11:12:19 PM (11 years ago)

Author:

mdawaffe

Message:

Upgrade: $wpdb->get_col_length() sanity check: bail on unexpected return value.

Merges [32429] for the 4.1 branch.

See #32165.

File:

• branches/4.1/src/wp-admin/includes/upgrade.php (modified) (1 diff)

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

@@ -1350 +1350 @@
         if ( $wp_current_db_version < 30135 ) {
                 $content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
+
+                if ( is_wp_error( $content_length ) ) {
+                        return;
+                }
+
                 if ( false === $content_length ) {
                         $content_length = array(