From 5a4f3f8266999674baeccfba0df8f911372b55a7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 3 Apr 2015 17:46:39 +0200
Subject: Remove Kolab's hack for Cyrus Murder bug in SETANNOTATION - it's not
 needed anymore

---
 program/lib/Roundcube/rcube_imap_generic.php | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'program/lib')

diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 0058bf487..ad7f2db27 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -48,8 +48,6 @@ class rcube_imap_generic
         '*'        => '\\*',
     );
 
-    public static $mupdate;
-
     protected $fp;
     protected $host;
     protected $logged = false;
@@ -3271,11 +3269,6 @@ class rcube_imap_generic
         }
 
         foreach ($data as $entry) {
-            // Workaround cyrus-murder bug, the entry[2] string needs to be escaped
-            if (self::$mupdate) {
-                $entry[2] = addcslashes($entry[2], '\\"');
-            }
-
             // ANNOTATEMORE drafts before version 08 require quoted parameters
             $entries[] = sprintf('%s (%s %s)', $this->escape($entry[0], true),
                 $this->escape($entry[1], true), $this->escape($entry[2], true));
@@ -3840,10 +3833,6 @@ class rcube_imap_generic
             $this->prefs['literal+'] = true;
         }
 
-        if (preg_match('/(\[| )MUPDATE=.*/', $str)) {
-            self::$mupdate = true;
-        }
-
         if ($trusted) {
             $this->capability_readed = true;
         }
-- 
cgit v1.2.3