Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 23d528a8aa32d984d032e2840b5ba0dd6144d399..7dc42177635fcf6885dafb843c843738b4970062 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -86,7 +86,7 @@ function message_post(App $a)
                $a->argc = 2;
                $a->argv[1] = 'new';
        } else {
-               goaway($_SESSION['return_url']);
+               goaway($a->cmd . '/' . $ret);
        }
 }
 
@@ -468,7 +468,7 @@ function render_messages(array $msg, $t)
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => Contact::magicLink($rr['url']),
-                       '$from_addr' => $contact['addr'],
+                       '$from_addr' => defaults($contact, 'addr', ''),
                        '$sparkle' => ' sparkle',
                        '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
                        '$subject' => $subject_e,