From 666bdd82dfc965f2284e3e08b677e23589cb9bde Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 22 Jun 2015 18:49:20 +0000 Subject: [PATCH] * Mail: fix sieve rules for moving mails into folder containing non-ascii chars (Dovecot requires sieve rules in utf8, while Cyrus needs utf7-imap) --- mail/inc/class.mail_sieve.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php index 897b7e3091..926a217dac 100644 --- a/mail/inc/class.mail_sieve.inc.php +++ b/mail/inc/class.mail_sieve.inc.php @@ -236,7 +236,7 @@ class mail_sieve switch ($rules['action']) { case 'folder': - $content['action_folder_text'][] = translation::convert($rules['action_arg'],'utf-8','utf7-imap'); + $content['action_folder_text'][] = $rules['action_arg']; break; case 'address': @@ -285,7 +285,7 @@ class mail_sieve switch ($content['action']) { case 'folder': - $newRule['action_arg'] = translation::convert(implode($content['action_folder_text']), 'utf7-imap', 'utf-8'); + $newRule['action_arg'] = implode($content['action_folder_text']); break; case 'address': $newRule['action_arg'] = implode(',',$content['action_address_text']);