diff options
| author | zotlabs <mike@macgirvin.com> | 2019-02-03 16:53:49 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-02-03 16:53:49 -0800 |
| commit | 8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b (patch) | |
| tree | b88764d7e68fef0a694c1d41fe08e21aa2281abd /Zotlabs/Module/Mail.php | |
| parent | a56bc0e1e03aa6b369cf33fc4f4af49c55f3a276 (diff) | |
| download | volse-hubzilla-8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b.tar.gz volse-hubzilla-8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b.tar.bz2 volse-hubzilla-8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b.zip | |
fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream.
Diffstat (limited to 'Zotlabs/Module/Mail.php')
| -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 d38c1d88c..3202d38a5 100644 --- a/Zotlabs/Module/Mail.php +++ b/Zotlabs/Module/Mail.php @@ -34,7 +34,7 @@ class Mail extends \Zotlabs\Web\Controller { } else { $body = cleanup_bbcode($body); - $results = linkify_tags($a, $body, local_channel()); + $results = linkify_tags($body, local_channel()); if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { $attachments = array(); @@ -111,7 +111,7 @@ class Mail extends \Zotlabs\Web\Controller { } require_once('include/text.php'); - linkify_tags($a, $body, local_channel()); + linkify_tags($body, local_channel()); if(! $recipient) { |