From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 program/steps/addressbook/undo.inc |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/program/steps/addressbook/undo.inc b/program/steps/addressbook/undo.inc
index 88701a4..9c17114 100644
--- a/program/steps/addressbook/undo.inc
+++ b/program/steps/addressbook/undo.inc
@@ -17,9 +17,6 @@
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
  +-----------------------------------------------------------------------+
-
- $Id$
-
 */
 
 // process ajax requests only
@@ -67,13 +64,6 @@
             unset($search[$s]);
             continue;
         }
-
-        while ($row = $result->next()) {
-            $row['sourceid'] = $s;
-            $key = $row['name'] . ':' . $row['sourceid'];
-            $records[$key] = $row;
-        }
-        unset($result);
 
         $search[$s] = $source->get_search_set();
     }

--
Gitblit v1.9.1