diff options
| author | Friendika <info@friendika.com> | 2011-10-23 19:06:04 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-10-23 19:06:04 -0700 |
| commit | fe2c8a18454253df09f20c8821d7d6e14c0ea8e0 (patch) | |
| tree | 0b92b6911bc718be7f4ac62eb87fadf3c9e0d094 /include/bb2diaspora.php | |
| parent | 7cbb69d87f1cadaaf2f252e6cfb0963011d66556 (diff) | |
| parent | 3512adda33328e8fbc9ccc810d2caf22513589a2 (diff) | |
| download | volse-hubzilla-fe2c8a18454253df09f20c8821d7d6e14c0ea8e0.tar.gz volse-hubzilla-fe2c8a18454253df09f20c8821d7d6e14c0ea8e0.tar.bz2 volse-hubzilla-fe2c8a18454253df09f20c8821d7d6e14c0ea8e0.zip | |
Merge branch 'master' into tag
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index ef5477f1b..d6c7994ba 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -58,7 +58,7 @@ function bb2diaspora($Text,$preserve_nl = false) { $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text); $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text); -// $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('Image/photo: ') . '$1', $Text); + $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '', $Text); // $Text = preg_replace("/\[img\](.*?)\[\/img\]/", t('image/photo'), $Text); // Perform MAIL Search |