use local photo in email, email photo upload point to new url

diff --git a/mod/message.php b/mod/message.php
index fa4af3f466de0f472681b967899b9e54071fd4af..251b5a4149125d80796ce32b1ebb88f8cf120584 100644 (file)
--- 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 494d5e93e227b2b67720fe7b2f3ec9d8ce9477be..3d2567f62737c36744379d2b7945cd65d1e6f837 100644 (file)
--- 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) {