mirror of
https://github.com/friendica/friendica
synced 2024-12-23 02:00:17 +00:00
Issue 1769: Some enhancements for sending wall mails
This commit is contained in:
parent
d40f32cc55
commit
77f7619720
2 changed files with 9 additions and 8 deletions
|
@ -446,9 +446,11 @@ function message_content(&$a) {
|
||||||
if($message['from-url'] == $myprofile) {
|
if($message['from-url'] == $myprofile) {
|
||||||
$from_url = $myprofile;
|
$from_url = $myprofile;
|
||||||
$sparkle = '';
|
$sparkle = '';
|
||||||
}
|
} elseif ($message['contact-id'] != 0) {
|
||||||
else {
|
$from_url = 'redir/'.$message['contact-id'];
|
||||||
$from_url = 'redir/' . $message['contact-id'];
|
$sparkle = ' sparkle';
|
||||||
|
} else {
|
||||||
|
$from_url = $message['from-url']."?zrl=".urlencode($myprofile);
|
||||||
$sparkle = ' sparkle';
|
$sparkle = ' sparkle';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -462,8 +464,7 @@ function message_content(&$a) {
|
||||||
$subject_e = template_escape($message['title']);
|
$subject_e = template_escape($message['title']);
|
||||||
$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
|
$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
|
||||||
$to_name_e = template_escape($message['name']);
|
$to_name_e = template_escape($message['name']);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$from_name_e = $message['from-name'];
|
$from_name_e = $message['from-name'];
|
||||||
$subject_e = $message['title'];
|
$subject_e = $message['title'];
|
||||||
$body_e = Smilies::replace(bbcode($message['body']));
|
$body_e = Smilies::replace(bbcode($message['body']));
|
||||||
|
|
|
@ -68,7 +68,7 @@ function wallmessage_post(&$a) {
|
||||||
info( t('Message sent.') . EOL );
|
info( t('Message sent.') . EOL );
|
||||||
}
|
}
|
||||||
|
|
||||||
// goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
|
goaway('profile/'.$user['nickname']);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue