aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-12-05 19:28:47 -0800
committerFriendika <info@friendika.com>2010-12-05 19:28:47 -0800
commit184f8e143e29b998620ba4daf89084b3a17a32cc (patch)
treeab178a9299954fb08c31b50bce2a6f776967e964 /mod
parent75306b62942a12995db67f48dd9b1a16f38c43eb (diff)
downloadvolse-hubzilla-184f8e143e29b998620ba4daf89084b3a17a32cc.tar.gz
volse-hubzilla-184f8e143e29b998620ba4daf89084b3a17a32cc.tar.bz2
volse-hubzilla-184f8e143e29b998620ba4daf89084b3a17a32cc.zip
use local photo in email, email photo upload point to new url
Diffstat (limited to 'mod')
-rw-r--r--mod/message.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php
index fa4af3f46..251b5a414 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -202,7 +202,7 @@ function message_content(&$a) {
'$from_name' =>$rr['from-name'],
'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
'$sparkle' => ' sparkle',
- '$from_photo' => $rr['from-photo'],
+ '$from_photo' => $rr['thumb'],
'$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
'$delete' => t('Delete conversation'),
'$body' => $rr['body'],
@@ -247,7 +247,10 @@ function message_content(&$a) {
$tpl = load_view_file('view/msg-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+ $a->page['htmlhead'] .= replace_macros($tpl, array(
+ '$nickname' => $a->user['nickname'],
+ '$baseurl' => $a->get_baseurl()
+ ));
$tpl = load_view_file('view/mail_conv.tpl');