Changeset 61191 for trunk/src/wp-includes/class-wp-date-query.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-wp-date-query.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-date-query.php

@@ -483 +483 @@
 
                 $valid_columns = array(
-                        'post_date',
-                        'post_date_gmt',
-                        'post_modified',
-                        'post_modified_gmt',
-                        'comment_date',
-                        'comment_date_gmt',
-                        'user_registered',
-                        'registered',
-                        'last_updated',
-                );
+                        'post_date',         // Part of $wpdb->posts.
+                        'post_date_gmt',     // Part of $wpdb->posts.
+                        'post_modified',     // Part of $wpdb->posts.
+                        'post_modified_gmt', // Part of $wpdb->posts.
+                        'comment_date',      // Part of $wpdb->comments.
+                        'comment_date_gmt',  // Part of $wpdb->comments.
+                        'user_registered',   // Part of $wpdb->users.
+                );
+
+                if ( is_multisite() ) {
+                        $valid_columns = array_merge(
+                                $valid_columns,
+                                array(
+                                        'registered',   // Part of $wpdb->blogs.
+                                        'last_updated', // Part of $wpdb->blogs.
+                                )
+                        );
+                }
 
                 // Attempt to detect a table prefix.
@@ -526 +534 @@
                                         'user_registered',
                                 ),
-                                $wpdb->blogs    => array(
+                        );
+
+                        if ( is_multisite() ) {
+                                $known_columns[ $wpdb->blogs ] = array(
                                         'registered',
                                         'last_updated',
-                                ),
-                        );
+                                );
+                        }
 
                         // If it's a known column name, add the appropriate table prefix.