Merge branch 'master' of github.com:roundcube/roundcubemail

pull/194/head
Thomas Bruederli 11 years ago
commit b38f83bb27

@ -313,7 +313,7 @@ insert_row: function(row, before)
if (row.id) domrow.id = row.id; if (row.id) domrow.id = row.id;
if (row.className) domrow.className = row.className; if (row.className) domrow.className = row.className;
if (row.style) $.extend(domrow.style, row.style); if (row.style) $.extend(domrow.style, row.style);
if (row.uid) $(domrow).data('uid', row.uid); if (row.uid) $(domrow).data('uid', String(row.uid)); // #1489906
for (var e, domcell, col, i=0; row.cols && i < row.cols.length; i++) { for (var e, domcell, col, i=0; row.cols && i < row.cols.length; i++) {
col = row.cols[i]; col = row.cols[i];

@ -1691,12 +1691,15 @@ class rcube_imap extends rcube_storage
$string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n $string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n
$string = substr($str, $string_offset - 1, $m[0]); $string = substr($str, $string_offset - 1, $m[0]);
$string = rcube_charset::convert($string, $charset, $dest_charset); $string = rcube_charset::convert($string, $charset, $dest_charset);
if ($string === false) {
if ($string === false || !strlen($string)) {
continue; continue;
} }
$res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string); $res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string);
$last = $m[0] + $string_offset - 1; $last = $m[0] + $string_offset - 1;
} }
if ($last < strlen($str)) { if ($last < strlen($str)) {
$res .= substr($str, $last, strlen($str)-$last); $res .= substr($str, $last, strlen($str)-$last);
} }

Loading…
Cancel
Save