From 0cf43e310c497f81a80e14c97c06563f137340ad Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 8 Jul 2013 09:27:55 +0200
Subject: Fix IMAP SETMETADATA parameters quoting (#1489231)

Conflicts:

	CHANGELOG
---
 CHANGELOG                                    | 1 +
 program/lib/Roundcube/rcube_imap_generic.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7351eb37a..321d62bc6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix IMAP SETMETADATA parameters quoting (#1489231)
 - Fix "could not load message" error on valid empty message body (#1489228)
 - Fix handling of message/rfc822 attachments on message forward and edit (#1489214)
 - Fix parsing of square bracket characters in IMAP response strings (#1489223)
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 365525b5f..3ed2d957c 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2988,7 +2988,7 @@ class rcube_imap_generic
         }
 
         foreach ($entries as $name => $value) {
-            $entries[$name] = $this->escape($name) . ' ' . $this->escape($value);
+            $entries[$name] = $this->escape($name) . ' ' . $this->escape($value, true);
         }
 
         $entries = implode(' ', $entries);
-- 
cgit v1.2.3