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/squirrelmail_usercopy/squirrelmail_usercopy.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index ee6bcc0..7849f91 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -151,10 +151,10 @@
$this->prefs = array();
/* connect to squirrelmail database */
- $db = new rcube_mdb2($rcmail->config->get('squirrelmail_dsn'));
- $db->db_connect('r'); // connect in read mode
+ $db = rcube_db::factory($rcmail->config->get('squirrelmail_dsn'));
- // $db->set_debug(true);
+ $db->set_debug($rcmail->config->get('sql_debug'));
+ $db->db_connect('r'); // connect in read mode
/* retrieve prefs */
$userprefs_table = $rcmail->config->get('squirrelmail_userprefs_table');
@@ -179,7 +179,7 @@
$rec['firstname'] = rcube_charset_convert(rtrim($sql_array['firstname']), $db_charset);
$rec['surname'] = rcube_charset_convert(rtrim($sql_array['lastname']), $db_charset);
$rec['email'] = rcube_charset_convert(rtrim($sql_array['email']), $db_charset);
- $rec['note'] = rcube_charset_convert(rtrim($sql_array['label']), $db_charset);
+ $rec['notes'] = rcube_charset_convert(rtrim($sql_array['label']), $db_charset);
if ($rec['name'] && $rec['email'])
$this->abook[] = $rec;
--
Gitblit v1.9.1