Changeset 49454

Timestamp:

10/30/2020 06:25:22 PM (4 years ago)

Author:

whyisjake

Message:

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

This commit brings the changes in [49452] to the 5.4 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.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• src/wp-includes/functions.php (modified) (1 diff)

branches/5.4/src/wp-includes/functions.php

@@ -1744 +1744 @@
 
         $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;
         }