Changeset 32435

Timestamp:

05/06/2015 11:14:34 PM (10 years ago)

Author:

mdawaffe

Message:

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

Merges [32429] for the 3.7 branch.

See #32165.

File:

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

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

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