diff options
| author | Friendika <info@friendika.com> | 2010-12-05 19:28:47 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2010-12-05 19:28:47 -0800 |
| commit | 184f8e143e29b998620ba4daf89084b3a17a32cc (patch) | |
| tree | ab178a9299954fb08c31b50bce2a6f776967e964 | |
| parent | 75306b62942a12995db67f48dd9b1a16f38c43eb (diff) | |
| download | volse-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
| -rw-r--r-- | mod/message.php | 7 | ||||
| -rw-r--r-- | view/en/msg-header.tpl | 2 |
2 files changed, 6 insertions, 3 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'); diff --git a/view/en/msg-header.tpl b/view/en/msg-header.tpl index 494d5e93e..3d2567f62 100644 --- a/view/en/msg-header.tpl +++ b/view/en/msg-header.tpl @@ -54,7 +54,7 @@ tinyMCE.init({ $(document).ready(function() { var uploader = new window.AjaxUpload( 'prvmail-upload', - { action: 'wall_upload', + { action: 'wall_upload/$nickname', name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').show(); }, onComplete: function(file,response) { |