Merge pull request #8006 from MrPetovan/bug/7991-remove-group-add-restrictions

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

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 69db45acf1fe0bf0107fbc9222c86442fa386516..db1a6f86b3db44e4674aeb8394772f12d6373df0 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -177,7 +177,7 @@ class Profile extends BaseModule
                }
 
                if (!$update) {
-            $tab = Strings::escapeTags(trim($_GET['tab'] ?? ''));
+                       $tab = Strings::escapeTags(trim($_GET['tab'] ?? ''));
 
                        $o .= ProfileModel::getTabs($a, $tab, $is_owner, $a->profile['nickname']);
 
@@ -208,7 +208,7 @@ class Profile extends BaseModule
                                                || strlen($a->user['deny_cid'])
                                                || strlen($a->user['deny_gid'])
                                        ) ? 'lock' : 'unlock',
-                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->user, true) : '',
+                                       'acl' => $is_owner ? ACL::getFullSelectorHTML($a->page, $a->user, true) : '',
                                        'bang' => '',
                                        'visitor' => $is_owner || $commvisitor ? 'block' : 'none',
                                        'profile_uid' => $a->profile['profile_uid'],
@@ -349,7 +349,13 @@ class Profile extends BaseModule
 
                $items = DBA::toArray($items_stmt);
 
-               $o .= conversation($a, $items, $pager, 'profile', $update, false, 'received', $a->profile['profile_uid']);
+               if ($pager->getStart() == 0 && !empty($a->profile['profile_uid'])) {
+                       $pinned_items = Item::selectPinned($a->profile['profile_uid'], ['uri', 'pinned'], ['true' . $sql_extra]);
+                       $pinned = Item::inArray($pinned_items);
+                       $items = array_merge($items, $pinned);
+               }
+
+               $o .= conversation($a, $items, $pager, 'profile', $update, false, 'pinned_received', $a->profile['profile_uid']);
 
                if (!$update) {
                        $o .= $pager->renderMinimal(count($items));