diff --git a/wp-includes/class-wpdb.php b/wp-includes/class-wpdb.php index 5260130ffd..795c106f29 100644 --- a/wp-includes/class-wpdb.php +++ b/wp-includes/class-wpdb.php @@ -1244,14 +1244,14 @@ class wpdb { * @see wpdb::prepare() * @see esc_sql() * - * @param string $string + * @param string $data * @return string */ - public function _weak_escape( $string ) { + public function _weak_escape( $data ) { if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) { _deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' ); } - return addslashes( $string ); + return addslashes( $data ); } /** @@ -1262,19 +1262,19 @@ class wpdb { * @see mysqli_real_escape_string() * @see mysql_real_escape_string() * - * @param string $string String to escape. + * @param string $data String to escape. * @return string Escaped string. */ - public function _real_escape( $string ) { - if ( ! is_scalar( $string ) ) { + public function _real_escape( $data ) { + if ( ! is_scalar( $data ) ) { return ''; } if ( $this->dbh ) { if ( $this->use_mysqli ) { - $escaped = mysqli_real_escape_string( $this->dbh, $string ); + $escaped = mysqli_real_escape_string( $this->dbh, $data ); } else { - $escaped = mysql_real_escape_string( $string, $this->dbh ); + $escaped = mysql_real_escape_string( $data, $this->dbh ); } } else { $class = get_class( $this ); @@ -1283,7 +1283,7 @@ class wpdb { /* translators: %s: Database access abstraction class, usually wpdb or a class extending wpdb. */ _doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), '3.6.0' ); - $escaped = addslashes( $string ); + $escaped = addslashes( $data ); } return $this->add_placeholder_escape( $escaped ); @@ -1354,11 +1354,11 @@ class wpdb { * * @since 2.3.0 * - * @param string $string String to escape. + * @param string $data String to escape. */ - public function escape_by_ref( &$string ) { - if ( ! is_float( $string ) ) { - $string = $this->_real_escape( $string ); + public function escape_by_ref( &$data ) { + if ( ! is_float( $data ) ) { + $data = $this->_real_escape( $data ); } } @@ -3161,15 +3161,15 @@ class wpdb { * * @since 4.2.0 * - * @param string $string String to check. + * @param string $input_string String to check. * @return bool True if ASCII, false if not. */ - protected function check_ascii( $string ) { + protected function check_ascii( $input_string ) { if ( function_exists( 'mb_check_encoding' ) ) { - if ( mb_check_encoding( $string, 'ASCII' ) ) { + if ( mb_check_encoding( $input_string, 'ASCII' ) ) { return true; } - } elseif ( ! preg_match( '/[^\x00-\x7F]/', $string ) ) { + } elseif ( ! preg_match( '/[^\x00-\x7F]/', $input_string ) ) { return true; } diff --git a/wp-includes/version.php b/wp-includes/version.php index b8994c6151..5790bd69f6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54949'; +$wp_version = '6.2-alpha-54950'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.