From 07a1796e8f7609b29132eaf2eaf03d8e93426139 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 24 Mar 2018 07:26:57 +0000 Subject: [PATCH] Fix: Groups can now be deleted again --- src/Model/Group.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Group.php b/src/Model/Group.php index 9e472a7ade..558e145ab7 100644 --- a/src/Model/Group.php +++ b/src/Model/Group.php @@ -40,7 +40,7 @@ class Group extends BaseObject // 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 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); } return true; @@ -138,7 +138,7 @@ class Group extends BaseObject return false; } - $group = dba::selectFirst('group', ['uid'], ['gid' => $gid]); + $group = dba::selectFirst('group', ['uid'], ['id' => $gid]); if (!DBM::is_result($group)) { return false; } -- 2.39.5