From 051003f03e39d79786fd72af20a18cc86361e0eb Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 11 Feb 2026 22:11:45 +0000 Subject: [PATCH] Coding Standards: Correct two ignore annotations for `WordPress.DB.PreparedSQL`. The `WordPress.DB.PreparedSQL` sniff contains two different error messages, which initially shared the same error code. A unique error code for the second message was added in WPCS 2.0.0. Reference: [https://github.com/WordPress/WordPress-Coding-Standards/pull/1601 PreparedSQL: use unique errorcode for messages]. Follow-up to [43628], [43630], [43654], [44472]. Props rodrigosprimo. See #64627. Built from https://develop.svn.wordpress.org/trunk@61615 git-svn-id: http://core.svn.wordpress.org/trunk@60926 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 2 +- wp-includes/ms-site.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 7c762991b0..795060f28b 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -588,7 +588,7 @@ function populate_options( array $options = array() ) { ); $keys = "'" . implode( "', '", array_keys( $options ) ) . "'"; - $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared + $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared $insert = ''; diff --git a/wp-includes/ms-site.php b/wp-includes/ms-site.php index 0058d1a482..6399dab72e 100644 --- a/wp-includes/ms-site.php +++ b/wp-includes/ms-site.php @@ -832,7 +832,7 @@ function wp_uninitialize_site( $site_id ) { $drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $site->id ); foreach ( (array) $drop_tables as $table ) { - $wpdb->query( "DROP TABLE IF EXISTS `$table`" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared + $wpdb->query( "DROP TABLE IF EXISTS `$table`" ); // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 6bb7d57ae9..62786ae8bb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '7.0-alpha-61614'; +$wp_version = '7.0-alpha-61615'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.