Browse Source

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

pull/1/head
Friendika 11 years ago
parent
commit
184f8e143e
2 changed files with 6 additions and 3 deletions
  1. +5
    -2
      mod/message.php
  2. +1
    -1
      view/en/msg-header.tpl

+ 5
- 2
mod/message.php View File

@ -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');


+ 1
- 1
view/en/msg-header.tpl View File

@ -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) {


Loading…
Cancel
Save