summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-09 15:40:41 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-09 15:41:41 +0200
commit057b9e3e7f5bd1707e72812b1e5f977face0baed (patch)
treedc171172bb4ced71e8cbda9350334609416e498f /plugins
parentaafc0a3d24149da9f7350f760932898319041815 (diff)
Fix zipdownload plugin issue with filenames charset (#1489156)
Conflicts: CHANGELOG plugins/zipdownload/zipdownload.php
Diffstat (limited to 'plugins')
-rw-r--r--plugins/zipdownload/zipdownload.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index de5888145..535248d7f 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/plugins/zipdownload/zipdownload.php
@@ -105,7 +105,7 @@ class zipdownload extends rcube_plugin
foreach ($message->attachments as $part) {
$pid = $part->mime_id;
$part = $message->mime_parts[$pid];
- $disp_name = $this->_convert_filename($part->filename, $part->charset);
+ $disp_name = $this->_convert_filename($part->filename);
if ($part->body) {
$orig_message_raw = $part->body;
@@ -258,9 +258,13 @@ class zipdownload extends rcube_plugin
/**
* Helper function to convert filenames to the configured charset
*/
+<<<<<<< HEAD
private function _convert_filename($str, $from = RCMAIL_CHARSET)
+=======
+ private function _convert_filename($str)
+>>>>>>> 4922472... Fix zipdownload plugin issue with filenames charset (#1489156)
{
- $str = rcube_charset::convert($str, $from == '' ? RCUBE_CHARSET : $from, $this->charset);
+ $str = rcube_charset::convert($str, RCUBE_CHARSET, $this->charset);
return strtr($str, array(':'=>'', '/'=>'-'));
}