diff options
| author | Friendika <info@friendika.com> | 2011-09-02 05:13:38 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-02 05:13:38 -0700 |
| commit | 93b9d713776bd18e9a3126f025a0c63c8589c201 (patch) | |
| tree | 29b823e74fd8f9a9b1ffa3e2d2227bfeaa0cce03 | |
| parent | 7bee0bff0d9949e2e001934ab22cb8bd6a71be76 (diff) | |
| download | volse-hubzilla-93b9d713776bd18e9a3126f025a0c63c8589c201.tar.gz volse-hubzilla-93b9d713776bd18e9a3126f025a0c63c8589c201.tar.bz2 volse-hubzilla-93b9d713776bd18e9a3126f025a0c63c8589c201.zip | |
completely enclose ~f hashtags so they don't get hijacked by D*
| -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); |