Skip to content

Commit 2ca15d1

Browse files
committed
Upgrade/install: Improve logic check when determining installation status.
Improve handling of ambiguous return values to determine if a blog is installed. Props zieladam, xknown. Merges [49377] to trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@49386 602fd350-edb4-49c9-b593-d223f7449a82
1 parent a6488f3 commit 2ca15d1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: src/wp-includes/functions.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -1756,7 +1756,8 @@ function is_blog_installed() {
17561756
continue;
17571757
}
17581758

1759-
if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
1759+
$described_table = $wpdb->get_results( "DESCRIBE $table;" );
1760+
if ( is_array( $described_table ) && count( $described_table ) === 0 ) {
17601761
continue;
17611762
}
17621763

0 commit comments

Comments
 (0)