diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-02-04 10:03:38 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-02-04 10:03:38 +0100 |
| commit | cf80f03084a2bdb0764f25a55c7b6707d2b3ef81 (patch) | |
| tree | 5e07935656f5e17258a773e41da4aa206648dfb5 /Zotlabs/Module/Mail.php | |
| parent | d97043725d3a38da9686dbf9501272d175e5420a (diff) | |
| parent | 47f31eed37b8cc94805d01b2ab661d69cc24fa38 (diff) | |
| download | volse-hubzilla-cf80f03084a2bdb0764f25a55c7b6707d2b3ef81.tar.gz volse-hubzilla-cf80f03084a2bdb0764f25a55c7b6707d2b3ef81.tar.bz2 volse-hubzilla-cf80f03084a2bdb0764f25a55c7b6707d2b3ef81.zip | |
Merge remote-tracking branch 'mike/master' into dev
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) { |