From 14f92886f1442dc9567fe0ff2f03161e2958f90b Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Fri, 10 Sep 2021 16:35:39 +0000 Subject: [PATCH] Code Modernization: Fix "passing null to non-nullable" deprecation in `wpdb::_real_escape()`. The PHP native `mysqli_real_escape_string()` function expects to be passed a string as the second parameter and this is not a nullable parameter. Passing `null` to it will result in a `mysqli_real_escape_string(): Passing null to parameter #2 ($string) of type string is deprecated` notice on PHP 8.1. Previously, an input type check was put in place to prevent fatal errors on PHP 8.0 when an array, object or resource was passed. Changeset [48980]. A `null` value was explicitly excluded from that check, even though a `null` value being passed would only ever result in an empty string anyway. This commit changes the previous input type check to also bow out early for `null` values and to automatically return an empty string for those. Refs: - https://www.php.net/manual/en/mysqli.real-escape-string.php - https://wiki.php.net/rfc/deprecate_null_to_scalar_internal_arg Follow-up to [48980]. Props jrf, hellofromTonya. See #53635. git-svn-id: https://develop.svn.wordpress.org/trunk@51799 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/wp-db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php index 04fa15c1ee6a9..340a6f5861e5b 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -1158,7 +1158,7 @@ function _weak_escape( $string ) { * @return string Escaped string. */ function _real_escape( $string ) { - if ( ! is_scalar( $string ) && ! is_null( $string ) ) { + if ( ! is_scalar( $string ) ) { return ''; }