Changeset 48869 for branches/5.5/src/wp-admin/includes/upgrade.php

Timestamp:

08/26/2020 05:05:54 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Make the check for empty home option in __get_option() more resilient.

This addresses a regression in [47808], where the home check expected an empty string to use siteurl as a fallback, but wpdb::get_var() returns null if the option is empty.

Props fjarrett.
Merges [48868] to the 5.5 branch.
Fixes #51011.

Location:

branches/5.5

Files:

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

branches/5.5/src/wp-admin/includes/upgrade.php

@@ -2568 +2568 @@
     $option = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-    if ( 'home' === $setting && '' === $option ) {
+    if ( 'home' === $setting && ! $option ) {
         return __get_option( 'siteurl' );
     }