Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / mod / lockview.php

diff --git a/mod/lockview.php b/mod/lockview.php
index af57730c8af68bba0c9f3706f7bde363339964f1..fc9fed306699ac270151915a4420794fac3fd3b7 100644 (file)
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -3,13 +3,12 @@
  * @file mod/lockview.php
  */
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Util\ACLFormatter;
 
 function lockview_content(App $a)
 {
@@ -61,13 +60,12 @@ function lockview_content(App $a)
                exit();
        }
 
-       /** @var ACLFormatter $aclFormatter */
-       $aclFormatter = BaseObject::getClass(ACLFormatter::class);
+       $aclFormatter = DI::aclFormatter();
 
-       $allowed_users = $aclFormatter->expand($item['allow_cid'] ?? '');
-       $allowed_groups = $aclFormatter->expand($item['allow_gid'] ?? '');
-       $deny_users = $aclFormatter->expand($item['deny_cid'] ?? '');
-       $deny_groups = $aclFormatter->expand($item['deny_gid'] ?? '');
+       $allowed_users = $aclFormatter->expand($item['allow_cid']);
+       $allowed_groups = $aclFormatter->expand($item['allow_gid']);
+       $deny_users = $aclFormatter->expand($item['deny_cid']);
+       $deny_groups = $aclFormatter->expand($item['deny_gid']);
 
        $o = L10n::t('Visible to:') . '<br />';
        $l = [];