Merge pull request #10632 from annando/fox-notifications

[friendica.git] / src / Module / Profile / Status.php

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 30ac5f06ff5907cd90c42ca0a87faa4796955886..c6a9e272a989afda1ee560a353b2815dc743f1bf 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -110,7 +110,7 @@ class Status extends BaseProfile
                        return '';
                }
 
-               $o .= self::getTabsHTML($a, 'status', $is_owner, $profile);
+               $o .= self::getTabsHTML($a, 'status', $is_owner, $profile['nickname'], $profile['hide-friends']);
 
                $o .= Widget::commonFriendsVisitor($profile['uid'], $profile['nickname']);
 
@@ -125,16 +125,9 @@ class Status extends BaseProfile
                        $x = [
                                'is_owner' => $is_owner,
                                'allow_location' => ($is_owner || $commvisitor) && $profile['allow_location'],
-                               'default_location' => $is_owner ? $a->user['default-location'] : '',
+                               'default_location' => $is_owner ? $profile['default-location'] : '',
                                'nickname' => $profile['nickname'],
-                               'lockstate' => is_array($a->user)
-                               && (strlen($a->user['allow_cid'])
-                                       || strlen($a->user['allow_gid'])
-                                       || strlen($a->user['deny_cid'])
-                                       || strlen($a->user['deny_gid'])
-                               ) ? 'lock' : 'unlock',
-                               'acl' => $is_owner ? ACL::getFullSelectorHTML(DI::page(), $a->user, true) : '',
-                               'bang' => '',
+                               'acl' => $is_owner ? ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), true) : '',
                                'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                'profile_uid' => $profile['uid'],
                        ];