Merge pull request #12025 from annando/no-boot-src-module

[friendica.git] / mod / ostatus_subscribe.php

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 781de3493addf9aa77a0ce4a58e9d36d1310b815..50ff445696d17cf821e38014290d68070c573b17 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -21,28 +21,28 @@
 
 use Friendica\App;
 use Friendica\Core\Protocol;
+use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Protocol\ActivityPub;
 
-function ostatus_subscribe_content(App $a)
+function ostatus_subscribe_content(App $a): string
 {
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
+       if (!Session::getLocalUser()) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                DI::baseUrl()->redirect('ostatus_subscribe');
                // NOTREACHED
        }
 
        $o = '<h2>' . DI::l10n()->t('Subscribing to contacts') . '</h2>';
 
-       $uid = local_user();
+       $uid = Session::getLocalUser();
 
        $counter = intval($_REQUEST['counter'] ?? 0);
 
        if (DI::pConfig()->get($uid, 'ostatus', 'legacy_friends') == '') {
-
                if ($_REQUEST['url'] == '') {
                        DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');
                        return $o . DI::l10n()->t('No contact provided.');