From 3989e1f450ed37f5780a59d0082c592f6c6becf8 Mon Sep 17 00:00:00 2001 From: Michael Adams Date: Wed, 6 May 2015 23:13:22 +0000 Subject: [PATCH] Upgrade: `$wpdb->get_col_length()` sanity check: bail on unexpected return value. Merges [32429] for the 4.1 branch. See #32165. Built from https://develop.svn.wordpress.org/branches/4.1@32431 git-svn-id: http://core.svn.wordpress.org/branches/4.1@32401 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 a777ca693b..6325e9da4c 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -1349,6 +1349,11 @@ function upgrade_415() { 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( 'type' => 'byte',