diff --git a/wp-includes/pomo/po.php b/wp-includes/pomo/po.php index 13fb16eb12..4a61aa8072 100644 --- a/wp-includes/pomo/po.php +++ b/wp-includes/pomo/po.php @@ -110,10 +110,10 @@ if ( ! class_exists( 'PO', false ) ) : /** * Formats a string in PO-style * - * @param string $string the string to format + * @param string $input_string the string to format * @return string the poified string */ - public static function poify( $string ) { + public static function poify( $input_string ) { $quote = '"'; $slash = '\\'; $newline = "\n"; @@ -124,12 +124,12 @@ if ( ! class_exists( 'PO', false ) ) : "\t" => '\t', ); - $string = str_replace( array_keys( $replaces ), array_values( $replaces ), $string ); + $input_string = str_replace( array_keys( $replaces ), array_values( $replaces ), $input_string ); - $po = $quote . implode( "{$slash}n{$quote}{$newline}{$quote}", explode( $newline, $string ) ) . $quote; + $po = $quote . implode( "{$slash}n{$quote}{$newline}{$quote}", explode( $newline, $input_string ) ) . $quote; // Add empty string on first line for readbility. - if ( false !== strpos( $string, $newline ) && - ( substr_count( $string, $newline ) > 1 || substr( $string, -strlen( $newline ) ) !== $newline ) ) { + if ( false !== strpos( $input_string, $newline ) && + ( substr_count( $input_string, $newline ) > 1 || substr( $input_string, -strlen( $newline ) ) !== $newline ) ) { $po = "$quote$quote$newline$po"; } // Remove empty strings. @@ -140,17 +140,17 @@ if ( ! class_exists( 'PO', false ) ) : /** * Gives back the original string from a PO-formatted string * - * @param string $string PO-formatted string + * @param string $input_string PO-formatted string * @return string enascaped string */ - public static function unpoify( $string ) { + public static function unpoify( $input_string ) { $escapes = array( 't' => "\t", 'n' => "\n", 'r' => "\r", '\\' => '\\', ); - $lines = array_map( 'trim', explode( "\n", $string ) ); + $lines = array_map( 'trim', explode( "\n", $input_string ) ); $lines = array_map( array( 'PO', 'trim_quotes' ), $lines ); $unpoified = ''; $previous_is_backslash = false; @@ -178,18 +178,18 @@ if ( ! class_exists( 'PO', false ) ) : } /** - * Inserts $with in the beginning of every new line of $string and + * Inserts $with in the beginning of every new line of $input_string and * returns the modified string * - * @param string $string prepend lines in this string - * @param string $with prepend lines with this string + * @param string $input_string prepend lines in this string + * @param string $with prepend lines with this string */ - public static function prepend_each_line( $string, $with ) { - $lines = explode( "\n", $string ); + public static function prepend_each_line( $input_string, $with ) { + $lines = explode( "\n", $input_string ); $append = ''; - if ( "\n" === substr( $string, -1 ) && '' === end( $lines ) ) { + if ( "\n" === substr( $input_string, -1 ) && '' === end( $lines ) ) { /* - * Last line might be empty because $string was terminated + * Last line might be empty because $input_string was terminated * with a newline, remove it from the $lines array, * we'll restore state by re-terminating the string at the end. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index a86b13ff61..a9eb10a91b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54958'; +$wp_version = '6.2-alpha-54959'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.