X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=99fb6b3b41cbc4e39787175edfd0921c2a8d8c95;hb=52a25ce6181c0b48a978f37a4ae3b94357dbb712;hp=726db0a754a6002d9b110726e80120895e958899;hpb=6aa1dcfad371f34fea1f8e39b73de2cc3dd05784;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 726db0a754..99fb6b3b41 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -58,7 +58,6 @@ function message_init(App $a)
 
 	$head_tpl = Renderer::getMarkupTemplate('message-head.tpl');
 	DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [
-		'$baseurl' => DI::baseUrl()->get(true),
 		'$base'    => $base
 	]);
 }
@@ -70,12 +69,13 @@ function message_post(App $a)
 		return;
 	}
 
+	$sender_id = DI::userSession()->getLocalUserId();
 	$replyto   = !empty($_REQUEST['replyto'])   ? trim($_REQUEST['replyto'])                   : '';
 	$subject   = !empty($_REQUEST['subject'])   ? trim($_REQUEST['subject'])                   : '';
 	$body      = !empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body'])) : '';
 	$recipient = !empty($_REQUEST['recipient']) ? intval($_REQUEST['recipient'])               : 0;
 
-	$ret = Mail::send($recipient, $body, $subject, $replyto);
+	$ret = Mail::send($sender_id, $recipient, $body, $subject, $replyto);
 	$norecip = false;
 
 	switch ($ret) {
@@ -178,7 +178,6 @@ function message_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
-			'$baseurl' => DI::baseUrl()->get(true),
 			'$nickname' => $a->getLoggedInUserNickname(),
 			'$linkurl' => DI::l10n()->t('Please enter a link URL:')
 		]);
@@ -284,7 +283,6 @@ function message_content(App $a)
 
 		$tpl = Renderer::getMarkupTemplate('msg-header.tpl');
 		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
-			'$baseurl' => DI::baseUrl()->get(true),
 			'$nickname' => $a->getLoggedInUserNickname(),
 			'$linkurl' => DI::l10n()->t('Please enter a link URL:')
 		]);