diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-12 00:17:28 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-04-12 00:17:28 -0700 |
| commit | 464808fb43c82ebb4beb3cd524651b4464315edf (patch) | |
| tree | 26d7b8806ea4c68f91b1d024c77104195e8f983b /modules/locale | |
| parent | 7f4a682a1d710fde0e5b5614d4d8e2b70a3ff23a (diff) | |
| download | brdo-464808fb43c82ebb4beb3cd524651b4464315edf.tar.gz brdo-464808fb43c82ebb4beb3cd524651b4464315edf.tar.bz2 | |
Issue #1513520 by pdrake, plach: Fixed locale_language_from_browser() incorrectly matches invalid strings.
Diffstat (limited to 'modules/locale')
| -rw-r--r-- | modules/locale/locale.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/locale/locale.test b/modules/locale/locale.test index 40502a29a..ffda6f580 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -1668,6 +1668,7 @@ class LocaleBrowserDetectionTest extends DrupalUnitTestCase { 'EN' => 'en', ' en' => 'en', 'en ' => 'en', + 'en, fr' => 'en', // A less specific language from the browser matches a more specific one // from the website, and the other way around for compatibility with @@ -1702,6 +1703,7 @@ class LocaleBrowserDetectionTest extends DrupalUnitTestCase { // Unresolvable cases. '' => FALSE, 'de,pl' => FALSE, + 'iecRswK4eh' => FALSE, $this->randomName(10) => FALSE, ); |