From a92beb6bdb9cb857e8cee6606033691f11692230 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 27 Nov 2012 08:43:43 +0100 Subject: Define RCUBE_CHARSET in place of RCMAIL_CHARSET for naming consistency --- program/lib/Roundcube/rcube_contacts.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program/lib/Roundcube/rcube_contacts.php') diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index e4500c744..5b4292a4c 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -698,7 +698,7 @@ class rcube_contacts extends rcube_addressbook if ($sql_arr['vcard']) { unset($sql_arr['email']); - $vcard = new rcube_vcard($sql_arr['vcard'], RCMAIL_CHARSET, false, $this->vcard_fieldmap); + $vcard = new rcube_vcard($sql_arr['vcard'], RCUBE_CHARSET, false, $this->vcard_fieldmap); $record += $vcard->get_assoc() + $sql_arr; } else { @@ -717,7 +717,7 @@ class rcube_contacts extends rcube_addressbook $words = ''; // copy values into vcard object - $vcard = new rcube_vcard($record['vcard'] ? $record['vcard'] : $save_data['vcard'], RCMAIL_CHARSET, false, $this->vcard_fieldmap); + $vcard = new rcube_vcard($record['vcard'] ? $record['vcard'] : $save_data['vcard'], RCUBE_CHARSET, false, $this->vcard_fieldmap); $vcard->reset(); foreach ($save_data as $key => $values) { list($field, $section) = explode(':', $key); -- cgit v1.2.3