diff options
| author | Jonathan Desrosiers <desrosj@git.wordpress.org> | 2020-10-29 18:03:35 +0000 |
|---|---|---|
| committer | Jonathan Desrosiers <desrosj@git.wordpress.org> | 2020-10-29 18:03:35 +0000 |
| commit | 2ca15d1e5ce70493c5c0c096ca0c76503d6da07c (patch) | |
| tree | 9e39910f6e84177dd23b221de1c543f7aec0d10c /src | |
| parent | a6488f3ffbe61da9e6acd9567b04275b0ba0c896 (diff) | |
| download | wordpress-2ca15d1e5ce70493c5c0c096ca0c76503d6da07c.tar.gz wordpress-2ca15d1e5ce70493c5c0c096ca0c76503d6da07c.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/wp-includes/functions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index 537425d898..3d0412630e 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -1756,7 +1756,8 @@ function is_blog_installed() { continue; } - if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) { + $described_table = $wpdb->get_results( "DESCRIBE $table;" ); + if ( is_array( $described_table ) && count( $described_table ) === 0 ) { continue; } |