Merge pull request #6541 from annando/mentions

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index 858748bb82e318ce3d68c52040dbb01b407bf621..f93e45984b9ab3e65db6f25ed7e4228c8b37f341 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
@@ -62,7 +63,7 @@ function profile_init(App $a)
        $blocked   = !local_user() && !remote_user() && Config::get('system', 'block_public');
        $userblock = !local_user() && !remote_user() && $a->profile['hidewall'];
 
-       if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == Contact::PAGE_COMMUNITY) {
+       if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY) {
                $a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
        }
 
@@ -130,7 +131,6 @@ function profile_content(App $a, $update = 0)
        $groups = [];
        $remote_cid = null;
 
-       $tab = 'posts';
        $o = '';
 
        if ($update) {
@@ -173,7 +173,7 @@ function profile_content(App $a, $update = 0)
 
                $o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
 
-               $commpage = $a->profile['page-flags'] == Contact::PAGE_COMMUNITY;
+               $commpage = $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                $commvisitor = $commpage && $remote_contact;
 
                $a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
@@ -257,7 +257,7 @@ function profile_content(App $a, $update = 0)
 
                // Does the profile page belong to a forum?
                // If not then we can improve the performance with an additional condition
-               $condition = ['uid' => $a->profile['profile_uid'], 'page-flags' => [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]];
+               $condition = ['uid' => $a->profile['profile_uid'], 'page-flags' => [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP]];
                if (!DBA::exists('user', $condition)) {
                        $sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
                } else {
@@ -310,8 +310,7 @@ function profile_content(App $a, $update = 0)
        if ($is_owner) {
                $unseen = Item::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
                if ($unseen) {
-                       $r = Item::update(['unseen' => false],
-                                       ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+                       Item::update(['unseen' => false], ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
                }
        }