Changeset 61191 for trunk/src/wp-includes/class-wpdb.php

Timestamp:

11/10/2025 08:26:46 PM (9 months ago)

Author:

westonruter

Message:

Code Modernization: Fix instances of using null as an array offset.

This avoids using multisite-specific tables and columns in WP_Date_Query::validate_column() when on a non-multisite install. Attempting to use $wpdb->blogs as an array index when null on a non-multisite install causes a deprecation notice in PHP 8.5. This also updates the multisite table alias in wpdb to make it clear they could be null.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/10498

Follow-up to [60904], [60809], [37477].

Props westonruter, desrosj.
See #63061.
Fixes #63957.

File:

• trunk/src/wp-includes/class-wpdb.php (modified) (7 diffs)

trunk/src/wp-includes/class-wpdb.php

@@ -468 +468 @@
          * @since 3.0.0
          *
-         * @var string
+         * @var string|null
          */
         public $blogs;
@@ -477 +477 @@
          * @since 5.1.0
          *
-         * @var string
+         * @var string|null
          */
         public $blogmeta;
@@ -486 +486 @@
          * @since 3.0.0
          *
-         * @var string
+         * @var string|null
          */
         public $registration_log;
@@ -495 +495 @@
          * @since 3.0.0
          *
-         * @var string
+         * @var string|null
          */
         public $signups;
@@ -504 +504 @@
          * @since 3.0.0
          *
-         * @var string
+         * @var string|null
          */
         public $site;
@@ -513 +513 @@
          * @since 3.0.0
          *
-         * @var string
+         * @var string|null
          */
         public $sitecategories;
@@ -522 +522 @@
          * @since 3.0.0
          *
-         * @var string
+         * @var string|null
          */
         public $sitemeta;