Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in wp-includes/class-wp-user-query.php.

Browse Source 
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.

This commit renames the `$string` parameter to `$search` in `WP_User_Query::get_search_sql()`.

Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.
Built from https://develop.svn.wordpress.org/trunk@53276


git-svn-id: http://core.svn.wordpress.org/trunk@52865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-04-26 11:47:26 +00:00
parent 1c5a65884a
commit 901dae255d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/class-wp-user-query.php
View File

@ -868,23 +868,23 @@ class WP_User_Query {
* *
* @global wpdb $wpdb WordPress database abstraction object. * @global wpdb $wpdb WordPress database abstraction object.
* *
* @param string $string * @param string $search
* @param array $cols * @param array $cols
* @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for single site. * @param bool $wild Whether to allow wildcard searches. Default is false for Network Admin, true for single site.
* Single site allows leading and trailing wildcards, Network Admin only trailing. * Single site allows leading and trailing wildcards, Network Admin only trailing.
* @return string * @return string
*/ */
protected function get_search_sql( $string, $cols, $wild = false ) { protected function get_search_sql( $search, $cols, $wild = false ) {
global $wpdb; global $wpdb;
$searches = array(); $searches = array();
$leading_wild = ( 'leading' === $wild || 'both' === $wild ) ? '%' : ''; $leading_wild = ( 'leading' === $wild || 'both' === $wild ) ? '%' : '';
$trailing_wild = ( 'trailing' === $wild || 'both' === $wild ) ? '%' : ''; $trailing_wild = ( 'trailing' === $wild || 'both' === $wild ) ? '%' : '';
$like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild; $like = $leading_wild . $wpdb->esc_like( $search ) . $trailing_wild;
foreach ( $cols as $col ) { foreach ( $cols as $col ) {
if ( 'ID' === $col ) { if ( 'ID' === $col ) {
$searches[] = $wpdb->prepare( "$col = %s", $string ); $searches[] = $wpdb->prepare( "$col = %s", $search );
} else { } else {
$searches[] = $wpdb->prepare( "$col LIKE %s", $like ); $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-beta2-53275'; $wp_version = '6.0-beta2-53276';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.