summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcmail.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-12-22 19:17:47 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-12-22 19:17:47 +0000
commit9949043d020a96e3c7485f65314d8b42acfc3fa8 (patch)
treea4fa98ad767f4877ccf388c72a6e0b73574c60f7 /roundcubemail/program/include/rcmail.php
parent61762a9746f823e2f3e4c8bccfe39828675eedbc (diff)
- Improve handling of whitespace characters after closing PHP tag in localization and config files
git-svn-id: https://svn.roundcube.net/trunk@4363 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcmail.php')
-rw-r--r--roundcubemail/program/include/rcmail.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 0eecd8ddb..f72b33e95 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -929,6 +929,9 @@ class rcmail
if (empty($this->texts) || $lang != $_SESSION['language']) {
$this->texts = array();
+ // handle empty lines after closing PHP tag in localization files
+ ob_start();
+
// get english labels (these should be complete)
@include(INSTALL_PATH . 'program/localization/en_US/labels.inc');
@include(INSTALL_PATH . 'program/localization/en_US/messages.inc');
@@ -949,6 +952,8 @@ class rcmail
$this->texts = array_merge($this->texts, $messages);
}
+ ob_end_clean();
+
$_SESSION['language'] = $lang;
}