From 77f761972011280c427ba7b3e6523bc428a70d22 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 May 2016 19:35:23 +0200
Subject: [PATCH] Issue 1769: Some enhancements for sending wall mails

---
 mod/message.php     | 11 ++++++-----
 mod/wallmessage.php |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mod/message.php b/mod/message.php
index 8108ff96bd..2d194ed244 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -446,9 +446,11 @@ function message_content(&$a) {
 			if($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
-			}
-			else {
-				$from_url = 'redir/' . $message['contact-id'];
+			} elseif ($message['contact-id'] != 0) {
+				$from_url = 'redir/'.$message['contact-id'];
+				$sparkle = ' sparkle';
+			} else {
+				$from_url = $message['from-url']."?zrl=".urlencode($myprofile);
 				$sparkle = ' sparkle';
 			}
 
@@ -462,8 +464,7 @@ function message_content(&$a) {
 				$subject_e = template_escape($message['title']);
 				$body_e = template_escape(Smilies::replace(bbcode($message['body'])));
 				$to_name_e = template_escape($message['name']);
-			}
-			else {
+			} else {
 				$from_name_e = $message['from-name'];
 				$subject_e = $message['title'];
 				$body_e = Smilies::replace(bbcode($message['body']));
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index b8859badd3..8642624a47 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -48,7 +48,7 @@ function wallmessage_post(&$a) {
 	$body = str_replace("\r\n","\n",$body);
 	$body = str_replace("\n\n","\n",$body);
 
-	
+
 	$ret = send_wallmessage($user, $body, $subject, $replyto);
 
 	switch($ret){
@@ -68,8 +68,8 @@ function wallmessage_post(&$a) {
 			info( t('Message sent.') . EOL );
 	}
 
-//	goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
-	
+	goaway('profile/'.$user['nickname']);
+
 }