Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-04 18:01:42 +01:00
Code Issues Projects Releases Wiki Activity

I18N: In Translations::translate_entry(), account for multi-line strings in files with Windows line endings.

Browse Source 
Fixes #22172.
Built from https://develop.svn.wordpress.org/trunk@35620


git-svn-id: http://core.svn.wordpress.org/trunk@35584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-11-11 22:49:25 +00:00
parent 1f15d30396
commit c8e0cd5c65
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/pomo/translations.php
View File

@ -82,6 +82,7 @@ class Translations {
*/ */
function translate_entry(&$entry) { function translate_entry(&$entry) {
$key = $entry->key(); $key = $entry->key();
$key = str_replace( "\r\n", "\n", $key );
return isset($this->entries[$key])? $this->entries[$key] : false; return isset($this->entries[$key])? $this->entries[$key] : false;
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-beta3-35619'; $wp_version = '4.4-beta3-35620';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.