diff options
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index c3863e448..08503227c 100644 --- a/program/steps/mail/compose.inc +++ b/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/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index e4e5093b1..9d4d42562 100644 --- a/program/steps/mail/sendmail.inc +++ b/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'], |