Fixed bug #1483856 in class rcube_imap

release-0.6
thomascube 19 years ago
parent c8c1e0ef3b
commit ba8f44c4da

@ -36,7 +36,7 @@ require_once('lib/utf7.inc');
*
* @package RoundCube Webmail
* @author Thomas Bruederli <roundcube@gmail.com>
* @version 1.22
* @version 1.26
* @link http://ilohamail.org
*/
class rcube_imap
@ -50,7 +50,6 @@ class rcube_imap
var $page_size = 10;
var $sort_field = 'date';
var $sort_order = 'DESC';
var $default_charset = 'ISO-8859-1';
var $delimiter = NULL;
var $caching_enabled = FALSE;
var $default_folders = array('inbox', 'drafts', 'sent', 'junk', 'trash');
@ -1715,8 +1714,13 @@ class rcube_imap
return $str;
}
/**
* Decode a mime-encoded string to internal charset
*
* @access static
*/
function decode_mime_string($input)
{
$out = '';
@ -1740,10 +1744,15 @@ class rcube_imap
}
// no encoding information, defaults to what is specified in the class header
return rcube_charset_convert($input, $this->default_charset);
return rcube_charset_convert($input, 'ISO-8859-1');
}
/**
* Decode a part of a mime-encoded string
*
* @access static
*/
function _decode_mime_string_part($str)
{
$a = explode('?', $str);
@ -1817,11 +1826,12 @@ class rcube_imap
return rcube_charset_convert($body, $ctype_param['charset']);
// defaults to what is specified in the class header
return rcube_charset_convert($body, $this->default_charset);
return rcube_charset_convert($body, 'ISO-8859-1');
}
/* --------------------------------
* private methods
* --------------------------------*/

Loading…
Cancel
Save