From 8161a8c62a2bfdee02fdbeb4aa7ea773f42e7afa Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 16 Sep 2023 06:48:59 +0000 Subject: [PATCH] Coding Standards: Remove extra parentheses in a few `str_contains()` conditionals. Follow-up to [55988]. Props Cybr. See #58831. git-svn-id: https://develop.svn.wordpress.org/trunk@56596 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/formatting.php | 2 +- src/wp-includes/vars.php | 4 +++- src/wp-mail.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index 73d95df2af..8d6d4341c1 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -4522,7 +4522,7 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) { $url = str_replace( "'", ''', $url ); } - if ( ( str_contains( $url, '[' ) ) || ( str_contains( $url, ']' ) ) ) { + if ( str_contains( $url, '[' ) || str_contains( $url, ']' ) ) { $parsed = wp_parse_url( $url ); $front = ''; diff --git a/src/wp-includes/vars.php b/src/wp-includes/vars.php index 117f053278..d6160dd23e 100644 --- a/src/wp-includes/vars.php +++ b/src/wp-includes/vars.php @@ -91,7 +91,9 @@ if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) { } } elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'safari' ) !== false ) { $is_safari = true; - } elseif ( ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Win' ) ) { + } elseif ( ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) ) + && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Win' ) + ) { $is_winIE = true; } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mac' ) ) { $is_macIE = true; diff --git a/src/wp-mail.php b/src/wp-mail.php index 1dd1e570d1..c405f6969e 100644 --- a/src/wp-mail.php +++ b/src/wp-mail.php @@ -107,7 +107,7 @@ for ( $i = 1; $i <= $count; $i++ ) { $content_transfer_encoding = explode( ';', $content_transfer_encoding ); $content_transfer_encoding = $content_transfer_encoding[0]; } - if ( ( 'multipart/alternative' === $content_type ) && ( str_contains( $line, 'boundary="' ) ) && ( '' === $boundary ) ) { + if ( 'multipart/alternative' === $content_type && str_contains( $line, 'boundary="' ) && '' === $boundary ) { $boundary = trim( $line ); $boundary = explode( '"', $boundary ); $boundary = $boundary[1];