From 94f1eb31c4d3bbd7e2e7c9b510663076b45b6ba8 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 14 Apr 2023 01:25:36 +0000 Subject: [PATCH] Coding Standards: Rename the `$myHTML` parameter to `$text` in `htmlentities2()`. This resolves a WPCS warning: {{{ Variable "$myHTML" is not in valid snake_case format, try "$my_h_t_m_l" }}} It also matches other formatting functions with the `$text` parameter, e.g. `esc_html()`, `ent2ncr()`, etc. Follow-up to [1727], [3717], [8662], [8743], [54927]. Props victoranto, audrasjb, jrf. Fixes #58129. git-svn-id: https://develop.svn.wordpress.org/trunk@55651 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/formatting.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php index 1f8a51b97c..d9cbd68f27 100644 --- a/src/wp-includes/formatting.php +++ b/src/wp-includes/formatting.php @@ -4524,13 +4524,15 @@ function sanitize_url( $url, $protocols = null ) { * * @since 1.2.2 * - * @param string $myHTML The text to be converted. + * @param string $text The text to be converted. * @return string Converted text. */ -function htmlentities2( $myHTML ) { - $translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES ); +function htmlentities2( $text ) { + $translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES ); + $translation_table[ chr( 38 ) ] = '&'; - return preg_replace( '/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/', '&', strtr( $myHTML, $translation_table ) ); + + return preg_replace( '/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/', '&', strtr( $text, $translation_table ) ); } /**