Merge pull request #5575 from annando/issue-5541

[friendica.git] / src / Model / Group.php

diff --git a/src/Model/Group.php b/src/Model/Group.php
index b41866c6ef8007f7fee7cdc308062a1c68036bbe..b01fc197014ad2ce9684ce4b05d39cc6bd1afc94 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -7,7 +7,6 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -39,7 +38,7 @@ class Group extends BaseObject
                                // access lists. What we're doing here is reviving the dead group, but old content which
                                // was restricted to this group may now be seen by the new group members.
                                $group = DBA::selectFirst('group', ['deleted'], ['id' => $gid]);
-                               if (DBM::is_result($group) && $group['deleted']) {
+                               if (DBA::isResult($group) && $group['deleted']) {
                                        DBA::update('group', ['deleted' => 0], ['id' => $gid]);
                                        notice(L10n::t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL);
                                }
@@ -114,7 +113,7 @@ class Group extends BaseObject
                        local_user()
                );
 
-               return DBA::inArray($stmt);
+               return DBA::toArray($stmt);
        }
 
        /**
@@ -133,7 +132,7 @@ class Group extends BaseObject
                }
 
                $group = DBA::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
-               if (DBM::is_result($group)) {
+               if (DBA::isResult($group)) {
                        return $group['id'];
                }
 
@@ -152,13 +151,13 @@ class Group extends BaseObject
                }
 
                $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]);
-               if (!DBM::is_result($group)) {
+               if (!DBA::isResult($group)) {
                        return false;
                }
 
                // remove group from default posting lists
                $user = DBA::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
-               if (DBM::is_result($user)) {
+               if (DBA::isResult($user)) {
                        $change = false;
 
                        if ($user['def_gid'] == $gid) {