harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show private message conversant in sidebar because without a reply you may not remember who it is/was.

Browse Source
This commit is contained in:
friendica 2013-10-12 00:57:00 -07:00
parent 1c8a36f9ca
commit c459228dca
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mod/message.php
View File

@ -378,6 +378,16 @@ function message_content(&$a) {
return $o; return $o;
} }
$other_channel = null;
if($messages[0]['to_xchan'] === $channel['channel_hash'])
$other_channel = $messages[0]['from'];
else
$other_channel = $messages[0]['to'];
require_once('include/Contact.php');
$a->set_widget('mail_conversant',vcard_from_xchan($other_channel,$get_observer_hash,'mail'));
$tpl = get_markup_template('msg-header.tpl'); $tpl = get_markup_template('msg-header.tpl');
@ -461,6 +471,7 @@ function message_content(&$a) {
$tpl = get_markup_template('mail_display.tpl'); $tpl = get_markup_template('mail_display.tpl');
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$prvmsg_header' => t('Private Conversation'),
'$thread_id' => $a->argv[1], '$thread_id' => $a->argv[1],
'$thread_subject' => $message['title'], '$thread_subject' => $message['title'],
'$thread_seen' => $seen, '$thread_seen' => $seen,

2
version.inc
View File

@ -1 +1 @@
2013-10-11.463 2013-10-12.464

1
view/tpl/mail_display.tpl
View File

@ -1,3 +1,4 @@
<h3>{{$prvmsg_header}}</h3>
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
{{foreach $mails as $mail}} {{foreach $mails as $mail}}
{{include file="mail_conv.tpl"}} {{include file="mail_conv.tpl"}}

4
view/tpl/xchan_vcard.tpl
View File

@ -4,7 +4,7 @@
</div> </div>
{{if $mode != 'mail'}}
<div id="profile-extra-links"> <div id="profile-extra-links">
<ul> <ul>
{{if $connect}} {{if $connect}}
@ -17,4 +17,4 @@
</div> </div>
{{/if}}