diff options
| -rw-r--r-- | mod/message.php | 11 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/xchan_vcard.tpl | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/mod/message.php b/mod/message.php index 058641a5e..1b4c6ae26 100644 --- a/mod/message.php +++ b/mod/message.php @@ -378,6 +378,16 @@ function message_content(&$a) { 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'); @@ -461,6 +471,7 @@ function message_content(&$a) { $tpl = get_markup_template('mail_display.tpl'); $o = replace_macros($tpl, array( + '$prvmsg_header' => t('Private Conversation'), '$thread_id' => $a->argv[1], '$thread_subject' => $message['title'], '$thread_seen' => $seen, diff --git a/version.inc b/version.inc index 61b453f1a..08609ebf2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-11.463 +2013-10-12.464 diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 7280f1e84..523a9160a 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,3 +1,4 @@ +<h3>{{$prvmsg_header}}</h3> <div class="generic-content-wrapper"> {{foreach $mails as $mail}} {{include file="mail_conv.tpl"}} diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 3dabdad95..ac2eaf7ae 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -4,7 +4,7 @@ </div> - +{{if $mode != 'mail'}} <div id="profile-extra-links"> <ul> {{if $connect}} @@ -17,4 +17,4 @@ </div> - +{{/if}} |