diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-24 07:44:08 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-24 07:44:08 +0100 |
| commit | 80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9 (patch) | |
| tree | 5a59cf3b29a70f22728e25d7c46ab8648bcda407 /mod/item.php | |
| parent | 71294faf2c182a678e5889b2ff9cabed16d83c82 (diff) | |
| parent | 4198efe03570606b35f3aba6cdf7f80de20384f4 (diff) | |
| download | volse-hubzilla-80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9.tar.gz volse-hubzilla-80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9.tar.bz2 volse-hubzilla-80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9.zip | |
Merge branch 'master' of git://github.com/tobiasd/friendika
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php index f9bf9a04e..feef7c95f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -165,7 +165,11 @@ function item_post(&$a) { } } + /** + * Fold multi-line [code] sequences + */ + $body = preg_replace('/\[\/code\]\s*\[code\]/m',"\n",$body); /** * Look for any tags and linkify them @@ -228,7 +232,7 @@ function item_post(&$a) { } } if($profile) { - $body = str_replace($name,'[url=' . $profile . ']' . $newname . '[/url]', $body); + $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname . '[/url]', $body); $profile = str_replace(',','%2c',$profile); if(strlen($str_tags)) $str_tags .= ','; |