diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-03-13 12:44:26 -0700 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-03-13 12:45:49 -0700 |
commit | 8f096c6b62b11f04a847363f5fe173c021fae9be (patch) | |
tree | 75cca0aba0de10381ede800b46d37a2e2728b439 /includes | |
parent | c6734081a8a08b01f5913a16a7e5d680906950c0 (diff) | |
download | brdo-8f096c6b62b11f04a847363f5fe173c021fae9be.tar.gz brdo-8f096c6b62b11f04a847363f5fe173c021fae9be.tar.bz2 |
Issue #655048 by Gábor Hojtsy, gumanist, intuited: Fixed Plural formula information blanked when importing a poorly-formed .po file.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/locale.inc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 0db4d4a07..72e466802 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -978,7 +978,7 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL // data untouched or if we don't have an existing plural formula. $header = _locale_import_parse_header($value['msgstr']); - // Get the plural formula and update in database. + // Get and store the plural formula if available. if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->uri)) { list($nplurals, $plural) = $p; db_update('languages') @@ -989,15 +989,6 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL ->condition('language', $lang) ->execute(); } - else { - db_update('languages') - ->fields(array( - 'plurals' => 0, - 'formula' => '', - )) - ->condition('language', $lang) - ->execute(); - } } $header_done = TRUE; } |