friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4675 from annando/group-delete 

Fix: Groups can now be deleted again
This commit is contained in:
Hypolite Petovan 2018-03-24 15:25:26 -04:00 committed by GitHub
parent 801d2ee166 07a1796e8f
commit 9665f4ed41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Group.php
View File

@ -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 <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 @@ 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;
}