diff options
| author | friendica <info@friendica.com> | 2013-11-13 23:10:29 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-13 23:10:29 -0800 |
| commit | ee629534d5245443152797bae81768680b5dda85 (patch) | |
| tree | f0a249c9d459ae809b714181090425023318430f /include/message.php | |
| parent | 412ebdade716d9c903a264916c53e15b2981042a (diff) | |
| download | volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.tar.gz volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.tar.bz2 volse-hubzilla-ee629534d5245443152797bae81768680b5dda85.zip | |
E2EE on private mail (also fixed autocomplete results dropdown for recipient which was positioned below the navbar instead of next to the recipient input box)
Diffstat (limited to 'include/message.php')
| -rw-r--r-- | include/message.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/message.php b/include/message.php index 3bcd5e209..2fca9bef0 100644 --- a/include/message.php +++ b/include/message.php @@ -76,12 +76,12 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $match = null; $images = null; - if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) + if(preg_match_all("/\[img\](.*?)\[\/img\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) $images = $match[1]; $match = false; - if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) + if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) $attaches = $match[1]; $attachments = ''; |