Fixing issue L10n::t()

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 75aca1f68dad1e1041a74823cebcdb1a7a6ac996..dcec6ef9c67ac9c0edb0e3191dc4c2fc8bb6d4db 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -5,7 +5,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
 
@@ -26,10 +26,10 @@ function wallmessage_post(App $a) {
        }
 
        $r = q("select * from user where nickname = '%s' limit 1",
-               dbesc($recipient)
+               DBA::escape($recipient)
        );
 
-       if (! DBM::is_result($r)) {
+       if (! DBA::isResult($r)) {
                logger('wallmessage: no recipient');
                return;
        }
@@ -69,7 +69,7 @@ function wallmessage_post(App $a) {
                        info(L10n::t('Message sent.') . EOL);
        }
 
-       goaway('profile/'.$user['nickname']);
+       $a->internalRedirect('profile/'.$user['nickname']);
 }
 
 
@@ -88,10 +88,10 @@ function wallmessage_content(App $a) {
        }
 
        $r = q("select * from user where nickname = '%s' limit 1",
-               dbesc($recipient)
+               DBA::escape($recipient)
        );
 
-       if (! DBM::is_result($r)) {
+       if (! DBA::isResult($r)) {
                notice(L10n::t('No recipient.') . EOL);
                logger('wallmessage: no recipient');
                return;
@@ -120,13 +120,6 @@ function wallmessage_content(App $a) {
                '$linkurl' => L10n::t('Please enter a link URL:')
        ]);
 
-       $tpl = get_markup_template('wallmsg-end.tpl');
-       $a->page['end'] .= replace_macros($tpl, [
-               '$baseurl' => System::baseUrl(true),
-               '$nickname' => $user['nickname'],
-               '$linkurl' => L10n::t('Please enter a link URL:')
-       ]);
-
        $tpl = get_markup_template('wallmessage.tpl');
        $o = replace_macros($tpl, [
                '$header' => L10n::t('Send Private Message'),