diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-02 17:32:03 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-02 17:32:03 -0700 |
| commit | b450b6a43593fa19e25bfd472848517092df2ef6 (patch) | |
| tree | 983a5a229a7a125fe70a4ce531ae338b4cbc2d9b /Zotlabs | |
| parent | 0d7062ffdf018287c14f09666cc0e0f82997ccca (diff) | |
| parent | 8f59b2d3e03b579d62efce9067acbcd32c5ac2b5 (diff) | |
| download | volse-hubzilla-b450b6a43593fa19e25bfd472848517092df2ef6.tar.gz volse-hubzilla-b450b6a43593fa19e25bfd472848517092df2ef6.tar.bz2 volse-hubzilla-b450b6a43593fa19e25bfd472848517092df2ef6.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Mail.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php index 12f3b8152..b58b169d0 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -19,7 +19,7 @@ class Mail extends \Zotlabs\Web\Controller { $replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : ''); $subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : ''); $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : ''); - $recipient = ((x($_REQUEST,'messageto')) ? notags(trim($_REQUEST['messageto'])) : ''); + $recipient = ((x($_REQUEST,'messageto')) ? notags(trim(urldecode($_REQUEST['messageto']))) : ''); $rstr = ((x($_REQUEST,'messagerecip')) ? notags(trim($_REQUEST['messagerecip'])) : ''); $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); @@ -124,7 +124,7 @@ class Mail extends \Zotlabs\Web\Controller { // We have a local_channel, let send_message use the session channel and save a lookup $ret = send_message(0, $recipient, $body, $subject, $replyto, $expires, $mimetype, $raw); - + if($ret['success']) { xchan_mail_query($ret['mail']); build_sync_packet(0,array('conv' => array($ret['conv']),'mail' => array(encode_mail($ret['mail'],true)))); |