diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php index 6ae1674b71..ef9e0668a1 100644 --- a/wp-includes/class-wp-query.php +++ b/wp-includes/class-wp-query.php @@ -536,10 +536,10 @@ class WP_Query { * @since 2.1.0 * @since 4.5.0 Removed the `comments_popup` public query variable. * - * @param array $array Defined query variables. + * @param array $query_vars Defined query variables. * @return array Complete query variables with undefined ones filled in empty. */ - public function fill_query_vars( $array ) { + public function fill_query_vars( $query_vars ) { $keys = array( 'error', 'm', @@ -580,8 +580,8 @@ class WP_Query { ); foreach ( $keys as $key ) { - if ( ! isset( $array[ $key ] ) ) { - $array[ $key ] = ''; + if ( ! isset( $query_vars[ $key ] ) ) { + $query_vars[ $key ] = ''; } } @@ -604,11 +604,12 @@ class WP_Query { ); foreach ( $array_keys as $key ) { - if ( ! isset( $array[ $key ] ) ) { - $array[ $key ] = array(); + if ( ! isset( $query_vars[ $key ] ) ) { + $query_vars[ $key ] = array(); } } - return $array; + + return $query_vars; } /** @@ -1747,18 +1748,18 @@ class WP_Query { * Retrieves the value of a query variable. * * @since 1.5.0 - * @since 3.9.0 The `$default` argument was introduced. + * @since 3.9.0 The `$default_value` argument was introduced. * - * @param string $query_var Query variable key. - * @param mixed $default Optional. Value to return if the query variable is not set. Default empty string. + * @param string $query_var Query variable key. + * @param mixed $default_value Optional. Value to return if the query variable is not set. Default empty string. * @return mixed Contents of the query variable. */ - public function get( $query_var, $default = '' ) { + public function get( $query_var, $default_value = '' ) { if ( isset( $this->query_vars[ $query_var ] ) ) { return $this->query_vars[ $query_var ]; } - return $default; + return $default_value; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 8649cabcb9..f35a9315d5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-beta2-53276'; +$wp_version = '6.0-beta2-53277'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.