Merge branch 'pull'

This commit is contained in:
Friendika 2011-10-24 15:51:14 -07:00
commit 4218e3f494
13 changed files with 109 additions and 38 deletions

View file

@ -338,7 +338,6 @@ function item_post(&$a) {
$bookmark = 0;
if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match)) {
$bookmark = 1;
$body = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'[url=$1]$2[/url]',$body);
}