The conversation functionality moved to a class

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

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index 94e93209ea345299227c043e95ed7842311c8c69..3c1ed8c5ac8ad6fb35dd361d9afc04e76753b45f 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -125,16 +125,14 @@ class Status extends BaseProfile
                        $x = [
                                'is_owner' => $is_owner,
                                'allow_location' => ($is_owner || $commvisitor) && $profile['allow_location'],
-                               'default_location' => $is_owner ? $a->getUserValue('default-location') : '',
+                               'default_location' => $is_owner ? $profile['default-location'] : '',
                                'nickname' => $profile['nickname'],
-                               'lockstate' => ACL::getLockstateForUserId($a->getUserId()) ? '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'],
                        ];
 
-                       $o .= status_editor($a, $x);
+                       $o .= DI::conversation()->statusEditor($x);
                }
 
                // Get permissions SQL - if $remote_contact is true, our remote user has been pre-verified and we already have fetched his/her groups
@@ -226,7 +224,7 @@ class Status extends BaseProfile
                        $items = array_merge($items, $pinned);
                }
 
-               $o .= conversation($a, $items, 'profile', false, false, 'pinned_received', $profile['uid']);
+               $o .= DI::conversation()->create($items, 'profile', false, false, 'pinned_received', $profile['uid']);
 
                $o .= $pager->renderMinimal(count($items));