Merge pull request #4675 from annando/group-delete

Fix: Groups can now be deleted again

diff --combined src/Model/Group.php
index f48dd5043190bc56b891a49caeda1527c81f6391,558e145ab79e48a64b925dec4475669af03d6e0f..28af7b045f0937482e9832f8c478cdd079138ae2
--- 1/src/Model/Group.php
--- 2/src/Model/Group.php
+++ b/src/Model/Group.php
@@@ -4,8 -4,8 +4,8 @@@
   */
  namespace Friendica\Model;
  
 -use Friendica\Core\L10n;
  use Friendica\BaseObject;
 +use Friendica\Core\L10n;
  use Friendica\Database\DBM;
  use dba;
  
@@@ -40,7 -40,7 +40,7 @@@ class Group extends BaseObjec
                                // 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']) {
-                                       dba::update('group', ['deleted' => 0], ['gid' => $gid]);
+                                       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);
                                }
                                return true;
@@@ -138,7 -138,7 +138,7 @@@
                        return false;
                }
  
-               $group = dba::selectFirst('group', ['uid'], ['gid' => $gid]);
+               $group = dba::selectFirst('group', ['uid'], ['id' => $gid]);
                if (!DBM::is_result($group)) {
                        return false;
                }
@@@ -289,7 -289,8 +289,7 @@@
                }
  
                if ($check_dead && !$use_gcontact) {
 -                      require_once 'include/acl_selectors.php';
 -                      $return = prune_deadguys($return);
 +                      Contact::pruneUnavailable($return);
                }
                return $return;
        }