strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bbcode: Changed the format of repeated messages once more.

Browse source
This commit is contained in:
Michael Vogel 2014-07-10 23:12:07 +02:00
parent 829a92a10e
commit cd7f05801a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/bbcode.php
View file

@ -488,10 +488,10 @@ function bb_ShareAttributes($share, $simplehtml) {
$text = $preshare."&gt;&gt; @".$userid_compact.": <br />".$share[3]; $text = $preshare."&gt;&gt; @".$userid_compact.": <br />".$share[3];
break; break;
case 7: case 7:
$text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact." ".$share[3]; $text = $preshare.html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8')." @".$userid_compact.": ".$share[3];
break; break;
case 8: case 8:
$text = $preshare."RT @".$userid_compact." ".$share[3]; $text = $preshare."RT @".$userid_compact.": ".$share[3];
break; break;
default: default:
$headline = trim($share[1]).'<div class="shared_header">'; $headline = trim($share[1]).'<div class="shared_header">';
@ -525,8 +525,12 @@ function GetProfileUsername($profile, $username, $compact = false) {
} }
$gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile); $gplus = preg_replace("=https?://plus.google.com/(.*)=ism", "$1@plus.google.com", $profile);
if ($gplus != $profile) if ($gplus != $profile) {
if ($compact)
return($gplususername." (".$username.")");
else
return($username." (".$gplus.")"); return($username." (".$gplus.")");
}
$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile); $friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2@$1", $profile);
if ($friendica != $profile) { if ($friendica != $profile) {