From cd7f05801a10ff9ffb47285db5541447673e89f1 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Thu, 10 Jul 2014 23:12:07 +0200 Subject: [PATCH] bbcode: Changed the format of repeated messages once more. --- include/bbcode.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index cea1dbdcc..84969dab9 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -488,10 +488,10 @@ function bb_ShareAttributes($share, $simplehtml) { $text = $preshare.">> @".$userid_compact.":
".$share[3]; break; case 7: - $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact." ".$share[3]; + $text = $preshare.html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3]; break; case 8: - $text = $preshare."RT @".$userid_compact." ".$share[3]; + $text = $preshare."RT @".$userid_compact.": ".$share[3]; break; default: $headline = trim($share[1]).'
'; @@ -525,8 +525,12 @@ function GetProfileUsername($profile, $username, $compact = false) { } $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile); - if ($gplus != $profile) - return($username." (".$gplus.")"); + if ($gplus != $profile) { + if ($compact) + return($gplususername." (".$username.")"); + else + return($username." (".$gplus.")"); + } $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile); if ($friendica != $profile) {