summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-10-19 15:38:57 +0100
committerGreg Roach <fisharebest@webtrees.net>2019-10-19 15:38:57 +0100
commitf18701c6beaba57391730a7417c1848d9af57865 (patch)
tree4cd0193d54148c5d60ea7525516deab09d55421f /app
parent91c514e5e3b4273fec62c3ff012bcd0a10cfaca1 (diff)
downloadwebtrees-f18701c6beaba57391730a7417c1848d9af57865.tar.gz
webtrees-f18701c6beaba57391730a7417c1848d9af57865.tar.bz2
webtrees-f18701c6beaba57391730a7417c1848d9af57865.zip
Fix: #2646 - broadcast messages should not have a 'sent from URL' footer
Diffstat (limited to 'app')
-rw-r--r--app/Http/Controllers/MessageController.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php
index 01a16acbd9..23e125373b 100644
--- a/app/Http/Controllers/MessageController.php
+++ b/app/Http/Controllers/MessageController.php
@@ -110,13 +110,11 @@ class MessageController extends AbstractBaseController
*/
public function broadcastAction(ServerRequestInterface $request): ResponseInterface
{
- $tree = $request->getAttribute('tree');
$user = $request->getAttribute('user');
$params = $request->getParsedBody();
$body = $params['body'];
$subject = $params['subject'];
$to = $params['to'];
- $url = $params['url'];
$ip = $request->getAttribute('client-ip');
$to_users = $this->recipientUsers($to);
@@ -126,15 +124,13 @@ class MessageController extends AbstractBaseController
'body' => $body,
'subject' => $subject,
'to' => $to,
- 'tree' => $tree,
- 'url' => $url,
]));
}
$errors = false;
foreach ($to_users as $to_user) {
- if ($this->deliverMessage($user, $to_user, $subject, $body, $url, $ip)) {
+ if ($this->deliverMessage($user, $to_user, $subject, $body, '', $ip)) {
FlashMessages::addMessage(I18N::translate('The message was successfully sent to %s.', e($to_user->realName())), 'success');
} else {
$errors = true;