aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-07 17:17:15 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-07 17:17:15 -0700
commitaf90b8afd615630915551fbbc3f36af27e935562 (patch)
treec9aa6cf42c2146bf5cee0a11a37ba6c93ef401d3
parentd94f6f7c53fbb01a76a6d3beb14968d02ebb3afa (diff)
parente62a95aabaa9343ea3f4d26355c66d4e8a19807c (diff)
downloadvolse-hubzilla-af90b8afd615630915551fbbc3f36af27e935562.tar.gz
volse-hubzilla-af90b8afd615630915551fbbc3f36af27e935562.tar.bz2
volse-hubzilla-af90b8afd615630915551fbbc3f36af27e935562.zip
Merge branch 'master' of https://github.com/habeascodice/red
-rwxr-xr-xinclude/items.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 730d81268..c9810bb7c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -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']);
}