From 9702c2ba94c1b0fa0e2df23a44b25d61c5feac5a Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 19 Aug 2010 06:21:58 +0000 Subject: - fixed database charset setting in squirrelmail_usercopy (#1486935) git-svn-id: https://svn.roundcube.net/trunk@3899 208e9e7b-5314-0410-a742-e7e81cd9613c --- plugins/squirrelmail_usercopy/squirrelmail_usercopy.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php index d87fbb9d3..3d1fcbb30 100644 --- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php +++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php @@ -144,8 +144,8 @@ class squirrelmail_usercopy extends rcube_plugin $address_table = $rcmail->config->get('squirrelmail_address_table'); $db_charset = $rcmail->config->get('squirrelmail_db_charset'); - $db->query('SET CHARACTER SET '.$db_charset); - $db->query('SET NAMES '.$db_encoding); + if ($db_charset) + $db->query('SET NAMES '.$db_charset); $sql_result = $db->query('SELECT * FROM '.$userprefs_table.' WHERE user=?', $uname); // ? is replaced with emailaddress -- cgit v1.2.3