From 2b1b2ebaf2ef0074b543a56fbfa229deb8bebe0f Mon Sep 17 00:00:00 2001 From: Michael Adams Date: Wed, 6 May 2015 23:15:09 +0000 Subject: [PATCH] Upgrade: `$wpdb->get_col_length()` sanity check: bail on unexpected return value. Merges [32429] for the 3.7 branch. See #32165. Built from https://develop.svn.wordpress.org/branches/3.7@32435 git-svn-id: http://core.svn.wordpress.org/branches/3.7@32405 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index cb38d408c2..5e623a684c 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -1290,6 +1290,11 @@ function upgrade_379() { 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( 'type' => 'byte',