Merge pull request #10586 from annando/app-user2

[friendica.git] / src / App / Page.php

diff --git a/src/App/Page.php b/src/App/Page.php
index af1f1810b705d36e92d966aaac1e7e85679584f7..766dd4ebef59dc4fa9ed1a59656778bf5e8480ed 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -248,6 +248,7 @@ class Page implements ArrayAccess
                        '$local_user'      => local_user(),
                        '$generator'       => 'Friendica' . ' ' . FRIENDICA_VERSION,
                        '$delitem'         => $l10n->t('Delete this item?'),
+                       '$blockAuthor'     => $l10n->t('Block this author? They won\'t be able to follow you nor see your public posts, and you won\'t be able to see their posts and their notifications.'),
                        '$update_interval' => $interval,
                        '$shortcut_icon'   => $shortcut_icon,
                        '$touch_icon'      => $touch_icon,
@@ -276,8 +277,8 @@ class Page implements ArrayAccess
                // If you're just visiting, let javascript take you home
                if (!empty($_SESSION['visitor_home'])) {
                        $homebase = $_SESSION['visitor_home'];
-               } elseif (!empty($app->user['nickname'])) {
-                       $homebase = 'profile/' . $app->user['nickname'];
+               } elseif (!empty($app->getLoggedInUserNickname())) {
+                       $homebase = 'profile/' . $app->getLoggedInUserNickname();
                }
 
                if (isset($homebase)) {
@@ -458,7 +459,6 @@ class Page implements ArrayAccess
                }
 
                $page    = $this->page;
-               $profile = $app->profile;
 
                header("X-Friendica-Version: " . FRIENDICA_VERSION);
                header("Content-type: text/html; charset=utf-8");