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

---
 plugins/acl/acl.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index b6e2c81..d693478 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -302,7 +302,7 @@
         li_elements.map(function() {
             val = this.value;
             td = $('td.'+this.id, row);
-            if (td && td.hasClass('enabled'))
+            if (td.length && td.hasClass('enabled'))
                 this.checked = true;
         });
 

--
Gitblit v1.9.1