diff options
| author | Mario <mario@mariovavti.com> | 2017-10-25 13:29:19 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2017-10-25 13:29:19 +0200 |
| commit | 344aa13c64f0fa7a246f3284bf9cdb267e6101d3 (patch) | |
| tree | 943809c01164dda7b6e4a26bc3d6c7e8c48bd6eb /include/bbcode.php | |
| parent | 61c86212b944efa0d78dcc0364b81bfb8a0d19bc (diff) | |
| parent | 69b22e3f7916b5ba19b5ed03a55ad72bf5995291 (diff) | |
| download | volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.gz volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.tar.bz2 volse-hubzilla-344aa13c64f0fa7a246f3284bf9cdb267e6101d3.zip | |
Merge branch '2.8RC'
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 9f9b5c5e1..9a2a6eb9b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -327,11 +327,16 @@ function bb_ShareAttributes($match) { if ($avatar != "") $headline .= '<a href="' . zid($profile) . '" ><img src="' . $avatar . '" alt="' . $author . '" height="32" width="32" /></a>'; + if(strpos($link,'/cards/')) + $type = t('card'); + else + $type = t('post'); + // Bob Smith wrote the following post 2 hours ago $fmt = sprintf( t('%1$s wrote the following %2$s %3$s'), '<a href="' . zid($profile) . '" >' . $author . '</a>', - '<a href="' . zid($link) . '" >' . t('post') . '</a>', + '<a href="' . zid($link) . '" >' . $type . '</a>', $reldate ); @@ -1255,6 +1260,9 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); } + // replace escaped links in code= blocks + $Text = str_replace('%eY9-!','http', $Text); + $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); // fix any escaped ampersands that may have been converted into links |