Merge remote-tracking branch 'friendika/master'

This commit is contained in:
Fabio Comuni 2011-10-26 12:15:38 +02:00
commit dc212de960
9 changed files with 56 additions and 17 deletions

View file

@ -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);