Merge pull request #6432 from annando/deleted-pending

[friendica.git] / mod / contactgroup.php

diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 887cf4dbaade8adc6e5b99a318b53e6d4f4d7dc3..753d3a07332139f4690deb35d4eb8785e2a6e832 100644 (file)
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -1,9 +1,7 @@
 <?php
 
 use Friendica\App;
-use Friendica\Database\DBM;
-
-require_once('include/group.php');
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 
@@ -13,12 +11,13 @@ function contactgroup_content(App $a)
                killme();
        }
 
+       $change = null;
        if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
                $r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $change = intval($a->argv[2]);
                }
        }
@@ -28,20 +27,20 @@ function contactgroup_content(App $a)
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        killme();
                }
 
                $group = $r[0];
                $members = Contact::getByGroupId($group['id']);
-               $preselected = array();
+               $preselected = [];
                if (count($members)) {
                        foreach ($members as $member) {
                                $preselected[] = $member['id'];
                        }
                }
 
-               if ($change) {
+               if (!empty($change)) {
                        if (in_array($change, $preselected)) {
                                Group::removeMember($group['id'], $change);
                        } else {