mirror of
https://github.com/friendica/friendica
synced 2025-04-24 11:10:18 +00:00
Merge remote-tracking branch 'friendika/master'
This commit is contained in:
commit
dc212de960
9 changed files with 56 additions and 17 deletions
|
@ -57,6 +57,7 @@ function bbcode($Text,$preserve_nl = false) {
|
|||
|
||||
|
||||
// Perform URL Search
|
||||
|
||||
$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1<a href="$2" target="external-link">$2</a>', $Text);
|
||||
|
||||
$Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue