diff options
| author | Erkan Yilmaz <erkan77@gmail.com> | 2011-09-03 03:58:40 +0200 |
|---|---|---|
| committer | Erkan Yilmaz <erkan77@gmail.com> | 2011-09-03 03:58:40 +0200 |
| commit | 652d43955b8813d45b4c619dfcc0331f0b855e0d (patch) | |
| tree | 051074e16e1d07bb3af6182ce2c193b6bfc4c927 /include | |
| parent | 463a136c15fe41218b9ebe3f7d18d12054de0798 (diff) | |
| parent | 9e9b6a3dd1dd6f364ee0448a37bc0d3df71b2977 (diff) | |
| download | volse-hubzilla-652d43955b8813d45b4c619dfcc0331f0b855e0d.tar.gz volse-hubzilla-652d43955b8813d45b4c619dfcc0331f0b855e0d.tar.bz2 volse-hubzilla-652d43955b8813d45b4c619dfcc0331f0b855e0d.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/bb2diaspora.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 92f492116..2eeea32cd 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -58,7 +58,8 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '[$1]($1)', $Text); - $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.*?)\[/url\])", '[$2]($1)', $Text); + $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[#$2]($1)', $Text); + $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/", '[$2]($1)', $Text); // $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text); // $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text); |