From b2ff06ae385bd838acee894ac3594a3f66e1e140 Mon Sep 17 00:00:00 2001 From: alec Date: Sat, 10 May 2008 14:28:45 +0000 Subject: - fix: fallback labels/messages ignored from en_US localisation files after r1360 (#1485057) git-svn-id: https://svn.roundcube.net/trunk@1372 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcmail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index e57b5dd6a..ccd46d6cb 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -588,9 +588,9 @@ class rcmail @include(INSTALL_PATH . 'program/localization/en_US/messages.inc'); if (is_array($labels)) - $sa_text_data = $labels; + $this->texts = $labels; if (is_array($messages)) - $sa_text_data = array_merge($sa_text_data, $messages); + $this->texts = array_merge($this->texts, $messages); // include user language files if ($lang != 'en' && is_dir(INSTALL_PATH . 'program/localization/' . $lang)) { -- cgit v1.2.3