Upgrade/Install: During the install process, add additional checking for exising tables.

This commit brings the changes in [49452] to the 5.5 branch.

If reinstalling WordPress, there is a condition where tables would exist in the database. Ensures that when that is the case, the install process can carry along without issue.

Fixes #51676.

Props xknown, garubi, mukesh27, desrosj, johnbillion, metalandcoffee, davidbaumwald, whyisjake.


git-svn-id: https://develop.svn.wordpress.org/branches/5.5@49453 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jake Spurlock 2020-10-30 17:54:48 +00:00
parent 902584148e
commit c9f38db45b

View File

@ -1754,7 +1754,10 @@ function is_blog_installed() {
}
$described_table = $wpdb->get_results( "DESCRIBE $table;" );
if ( is_array( $described_table ) && count( $described_table ) === 0 ) {
if (
( ! $described_table && empty( $wpdb->last_error ) ) ||
( is_array( $described_table ) && 0 === count( $described_table ) )
) {
continue;
}