Merge pull request #626 from habeascodice/master

regex missing terminator char
This commit is contained in:
RedMatrix 2014-10-08 23:30:24 +11:00
commit 98af2de9b4

View file

@ -1570,7 +1570,7 @@ function get_atom_elements($feed,$item,&$author) {
// We could probably turn these old Friendica bbcode bookmarks into bookmark tags but we'd have to
// create a term table item for them. For now just make sure they stay as links.
$res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]','[url$1]$2[/url]',$res['body']);
$res['body'] = preg_replace('/\[bookmark(.*?)\](.*?)\[\/bookmark\]/','[url$1]$2[/url]',$res['body']);
}