From 824144214f82b4f00a82ac688a9adea7386c1bd0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 17 Jan 2011 08:36:51 -0500
Subject: [PATCH] - Workaround for setting charset in case of malformed bodystructure response (#1487700)
---
program/include/rcube_plugin.php | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 8ac8745..85ed774 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -5,7 +5,7 @@
| program/include/rcube_plugin.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2009, Roundcube Dev. - Switzerland |
+ | Copyright (C) 2008-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -75,7 +75,7 @@
{
$this->ID = get_class($this);
$this->api = $api;
- $this->home = $api->dir . DIRECTORY_SEPARATOR . $this->ID;
+ $this->home = $api->dir . $this->ID;
$this->urlbase = $api->url . $this->ID . '/';
}
@@ -129,12 +129,17 @@
$lang = $_SESSION['language'];
$locdir = slashify(realpath(slashify($this->home) . $dir));
$texts = array();
-
+
+ // use buffering to handle empty lines/spaces after closing PHP tag
+ ob_start();
+
foreach (array('en_US', $lang) as $lng) {
@include($locdir . $lng . '.inc');
$texts = (array)$labels + (array)$messages + (array)$texts;
}
+ ob_end_clean();
+
// prepend domain to text keys and add to the application texts repository
if (!empty($texts)) {
$add = array();
--
Gitblit v1.9.1