From ba9c7b40f0dfcadf1d5711246e7b332ff7a60787 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 4 May 2011 18:53:11 +0000
Subject: - Apply fixes from trunk (up to r4728)

---
 program/include/rcube_imap_generic.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'program/include/rcube_imap_generic.php')

diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 36638d25d..85c21f414 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -1207,8 +1207,8 @@ class rcube_imap_generic
     {
         if (is_array($items) && !empty($items)) {
             foreach ($items as $key => $value) {
-                $args[] = $this->escape($key);
-                $args[] = $this->escape($value);
+                $args[] = $this->escape($key, true);
+                $args[] = $this->escape($value, true);
             }
         }
 
@@ -1219,7 +1219,7 @@ class rcube_imap_generic
 
         if ($code == self::ERROR_OK && preg_match('/\* ID /i', $response)) {
             $response = substr($response, 5); // remove prefix "* ID "
-            $items    = $this->tokenizeResponse($response);
+            $items    = $this->tokenizeResponse($response, 1);
             $result   = null;
 
             for ($i=0, $len=count($items); $i<$len; $i += 2) {
-- 
cgit v1.2.3