From 01428753d08b242a385eafc47818f7d965bc30c9 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 23 Mar 2025 14:48:31 +0000 Subject: [PATCH] Coding Standards: Remove a one-time variable in `WP_MS_Sites_List_Table::prepare_items()`. This allows the `$wpdb::prepare()` call to be picked up correctly by PHPCS. Follow-up to [28712], [55656]. Props aristath, poena, afercia, SergeyBiryukov. See #62279. Built from https://develop.svn.wordpress.org/trunk@60069 git-svn-id: http://core.svn.wordpress.org/trunk@59405 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-sites-list-table.php | 10 +++++----- wp-includes/version.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 19fb0e009b..01968869a1 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -115,13 +115,13 @@ class WP_MS_Sites_List_Table extends WP_List_Table { || preg_match( '/^[0-9]{1,3}\.$/', $s ) ) { // IPv4 address. - $sql = $wpdb->prepare( - "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", - $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) + $reg_blog_ids = $wpdb->get_col( + $wpdb->prepare( + "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", + $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) + ) ); - $reg_blog_ids = $wpdb->get_col( $sql ); - if ( $reg_blog_ids ) { $args['site__in'] = $reg_blog_ids; } diff --git a/wp-includes/version.php b/wp-includes/version.php index 91095b8ada..8cbfaf36c0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-beta3-60068'; +$wp_version = '6.8-beta3-60069'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.