diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-07 11:39:36 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-12-07 11:39:36 +0000 |
| commit | 687e05e28997d48ccac02b98f81d71e9928fec16 (patch) | |
| tree | 98fa24244d3c6ab7480f74bb89f42b423ae76937 /roundcubemail/program/steps/mail | |
| parent | ea3d91249609d60de8ea570b2f7694fc283a175c (diff) | |
- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
git-svn-id: https://svn.roundcube.net/trunk@5564 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/sendmail.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index c3863e448..08503227c 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -245,7 +245,7 @@ if (!empty($msg_uid)) $MESSAGE->compose = array(); // get user's identities -$MESSAGE->identities = $USER->list_identities(); +$MESSAGE->identities = $RCMAIL->user->list_identities(); if (count($MESSAGE->identities)) { foreach ($MESSAGE->identities as $idx => $ident) { diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc index e4e5093b1..9d4d42562 100644 --- a/roundcubemail/program/steps/mail/sendmail.inc +++ b/roundcubemail/program/steps/mail/sendmail.inc @@ -72,9 +72,9 @@ function rcmail_encrypt_header($what) // get identity record function rcmail_get_identity($id) { - global $USER, $OUTPUT; + global $RCMAIL, $OUTPUT; - if ($sql_arr = $USER->get_identity($id)) { + if ($sql_arr = $RCMAIL->user->get_identity($id)) { $out = $sql_arr; $out['mailto'] = $sql_arr['email']; $out['string'] = format_email_recipient($sql_arr['email'], |