From fa9a33d818470a5796f0ff8797f98b510ed8de18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 09:57:30 +0200 Subject: Merging upstream version 6.5+dfsg1. Signed-off-by: Daniel Baumann --- wp-includes/class-wp-text-diff-renderer-inline.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wp-includes/class-wp-text-diff-renderer-inline.php') diff --git a/wp-includes/class-wp-text-diff-renderer-inline.php b/wp-includes/class-wp-text-diff-renderer-inline.php index f3e4f6b..aef1738 100644 --- a/wp-includes/class-wp-text-diff-renderer-inline.php +++ b/wp-includes/class-wp-text-diff-renderer-inline.php @@ -24,10 +24,10 @@ class WP_Text_Diff_Renderer_inline extends Text_Diff_Renderer_inline { * @param string $newlineEscape * @return string */ - public function _splitOnWords( $string, $newlineEscape = "\n" ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound + public function _splitOnWords( $string, $newlineEscape = "\n" ) { // phpcs:ignore Universal.NamingConventions.NoReservedKeywordParameterNames.stringFound,WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase $string = str_replace( "\0", '', $string ); $words = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE ); - $words = str_replace( "\n", $newlineEscape, $words ); + $words = str_replace( "\n", $newlineEscape, $words ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.VariableNotSnakeCase return $words; } } -- cgit v1.2.3