diff --git a/mod/message.php b/mod/message.php index 96ba59934..f358ba975 100644 --- a/mod/message.php +++ b/mod/message.php @@ -470,7 +470,7 @@ function message_content(App $a) { 'id' => $message['id'], 'from_name' => $from_name_e, 'from_url' => $from_url, - 'from_url2' => $message['from-url'], + 'from_addr' => $contact['addr'], 'sparkle' => $sparkle, 'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), 'subject' => $subject_e, @@ -584,7 +584,7 @@ function render_messages(array $msg, $t) { '$id' => $rr['id'], '$from_name' => $participants, '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']), - '$from_url2' => $rr['url'], + '$from_addr' => $contact['addr'], '$sparkle' => ' sparkle', '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), '$subject' => $subject_e, diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl index 990af5ca0..9ad7fec34 100644 --- a/view/templates/mail_conv.tpl +++ b/view/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl index 88a482af4..04f23a371 100644 --- a/view/templates/mail_list.tpl +++ b/view/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/frio/templates/mail_conv.tpl b/view/theme/frio/templates/mail_conv.tpl index a130466cd..2ad989849 100644 --- a/view/theme/frio/templates/mail_conv.tpl +++ b/view/theme/frio/templates/mail_conv.tpl @@ -1,14 +1,14 @@
{{$mail.date}}
-

{{$mail.from_name}}

+

{{$mail.from_name}}

{{$mail.body}} diff --git a/view/theme/frio/templates/mail_list.tpl b/view/theme/frio/templates/mail_list.tpl index d74306a80..d5062a232 100644 --- a/view/theme/frio/templates/mail_list.tpl +++ b/view/theme/frio/templates/mail_list.tpl @@ -4,8 +4,8 @@
diff --git a/view/theme/frost-mobile/templates/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl index 78afeb51f..3d9eebec2 100644 --- a/view/theme/frost-mobile/templates/mail_conv.tpl +++ b/view/theme/frost-mobile/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/theme/frost-mobile/templates/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl index c0d5d1da1..ffde5d68f 100644 --- a/view/theme/frost-mobile/templates/mail_list.tpl +++ b/view/theme/frost-mobile/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/frost/templates/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl index bdf97bd27..7a43952c4 100644 --- a/view/theme/frost/templates/mail_conv.tpl +++ b/view/theme/frost/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/theme/frost/templates/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl index c0d5d1da1..ffde5d68f 100644 --- a/view/theme/frost/templates/mail_list.tpl +++ b/view/theme/frost/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl index d51c3e34a..89827cd31 100644 --- a/view/theme/quattro/templates/mail_conv.tpl +++ b/view/theme/quattro/templates/mail_conv.tpl @@ -23,7 +23,7 @@
{{$mail.from_name}} {{$mail.ago}}
@@ -47,7 +47,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}