diff options
| author | zotlabs <mike@macgirvin.com> | 2016-12-05 14:50:34 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-12-05 14:50:34 -0800 |
| commit | fbf13dde213dcecfdc6c6e5d95b165bb46eda85a (patch) | |
| tree | 61d1e5fef7b9569b71b1a39ea6be5bec35b800d7 /include/bb2diaspora.php | |
| parent | bdd713413abaf85f2cb8de86ef9c4032f8a91bd5 (diff) | |
| download | volse-hubzilla-fbf13dde213dcecfdc6c6e5d95b165bb46eda85a.tar.gz volse-hubzilla-fbf13dde213dcecfdc6c6e5d95b165bb46eda85a.tar.bz2 volse-hubzilla-fbf13dde213dcecfdc6c6e5d95b165bb46eda85a.zip | |
minor changes to config api and markdown_to_bb
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e6c97a750..e22b6a7dd 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -149,16 +149,18 @@ function markdown_to_bb($s, $use_zrl = false) { $s = html2bbcode($s); + $s = preg_replace("/\[([uz])rl=(.*?)\]\[\/[uz]rl\]/ism",'[$1rl=$2]$2[/$1rl]',$s); + // protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands $s = str_replace('♲',html_entity_decode('♲',ENT_QUOTES,'UTF-8'),$s); // 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 |