mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2495 from annando/1604-messagelist

Browse source 
Bugfix: The message list always showed "x and you"
This commit is contained in:
Tobias Diekershoff 2016-05-02 06:06:47 +02:00
commit 7418e5256e
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mod/message.php
View file

@ -183,7 +183,7 @@ function message_content(&$a) {
return; return;
} }
$myprofile = 'profile/' . $a->user['nickname']; $myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
$tpl = get_markup_template('mail_head.tpl'); $tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array( $header = replace_macros($tpl, array(
@ -357,8 +357,7 @@ function message_content(&$a) {
$r = q("SELECT count(*) AS `total` FROM `mail` $r = q("SELECT count(*) AS `total` FROM `mail`
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
intval(local_user()), intval(local_user())
dbesc($myprofile)
); );
if(count($r)) $a->set_pager_total($r[0]['total']); if(count($r)) $a->set_pager_total($r[0]['total']);
@ -550,19 +549,16 @@ function render_messages($msg, $t) {
$tpl = get_markup_template($t); $tpl = get_markup_template($t);
$rslt = ''; $rslt = '';
$myprofile = 'profile/' . $a->user['nickname']; $myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
foreach($msg as $rr) { foreach($msg as $rr) {
if($rr['unknown']) { if($rr['unknown'])
$participants = sprintf( t("Unknown sender - %s"),$rr['from-name']); $participants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
} elseif (link_compare($rr['from-url'], $myprofile))
elseif (link_compare($rr['from-url'], $myprofile)){
$participants = sprintf( t("You and %s"), $rr['name']); $participants = sprintf( t("You and %s"), $rr['name']);
} else
else {
$participants = sprintf(t("%s and You"), $rr['from-name']); $participants = sprintf(t("%s and You"), $rr['from-name']);
}
if($a->theme['template_engine'] === 'internal') { if($a->theme['template_engine'] === 'internal') {
$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')); $subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));