aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-08 19:10:08 -0700
committerMario Vavti <mario@mariovavti.com>2017-05-10 14:48:04 +0200
commitfa94c0a65b7e35c74429ff9fb507289714c6de76 (patch)
tree02fa42c9eabfafbac748c851a6767660ee325d46 /include
parent6c0e0b3eaeead84686148f0fa43cd441357a8b8c (diff)
downloadvolse-hubzilla-fa94c0a65b7e35c74429ff9fb507289714c6de76.tar.gz
volse-hubzilla-fa94c0a65b7e35c74429ff9fb507289714c6de76.tar.bz2
volse-hubzilla-fa94c0a65b7e35c74429ff9fb507289714c6de76.zip
handle mastodon urls in markdown/bbcode conversion
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php2
-rw-r--r--include/markdown.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index c0033f280..2f15cefe1 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -776,7 +776,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
// Perform URL Search
- $urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,\@\(\)]';
+ $urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]';
if (strpos($Text,'http') !== false) {
if($tryoembed) {
diff --git a/include/markdown.php b/include/markdown.php
index 7e1f1c42c..a9617f72b 100644
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -199,10 +199,10 @@ function markdown_to_bb($s, $use_zrl = false) {
// Convert everything that looks like a link to a link
if($use_zrl) {
$s = str_replace(array('[img','/img]'),array('[zmg','/zmg]'),$s);
- $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\(\)]+)/ism", '$1[zrl=$2$3]$2$3[/zrl]',$s);
+ $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ism", '$1[zrl=$2$3]$2$3[/zrl]',$s);
}
else {
- $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\(\)]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
+ $s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,\@\(\)]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
}
// remove duplicate adjacent code tags