X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGroup.php;h=b01fc197014ad2ce9684ce4b05d39cc6bd1afc94;hb=ca2c316de03ad0be95326b4d06edfec076c1a85f;hp=b41866c6ef8007f7fee7cdc308062a1c68036bbe;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git diff --git a/src/Model/Group.php b/src/Model/Group.php index b41866c6ef..b01fc19701 100644 --- 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 may 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) {