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

Merge remote-tracking branch 'upstream/develop' into dbstructure-class

This commit is contained in:
Michael 2017-12-14 21:42:26 +00:00
parent 2179a7faa8 4269c108c1
commit cf56de1e77
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/api.php
View File

@ -4783,7 +4783,7 @@ function api_friendica_group_create($type)
intval($uid) intval($uid)
); );
if (count($contact)) if (count($contact))
$result = Group::create_member($uid, $name, $cid, $gid); $result = Group::addMember($gid, $cid);
else { else {
$erroraddinguser = true; $erroraddinguser = true;
$errorusers[] = $cid; $errorusers[] = $cid;
@ -4846,7 +4846,7 @@ function api_friendica_group_update($type)
); );
if (count($contact)) { if (count($contact)) {
$result = Group::create_member($uid, $name, $cid, $gid); $result = Group::addMember($gid, $cid);
} else { } else {
$erroraddinguser = true; $erroraddinguser = true;
$errorusers[] = $cid; $errorusers[] = $cid;

2
mod/group.php
View File

@ -174,7 +174,7 @@ function group_content(App $a) {
if (in_array($change, $preselected)) { if (in_array($change, $preselected)) {
Group::removeMember($group['id'], $change); Group::removeMember($group['id'], $change);
} else { } else {
Group::create_member(local_user(), $group['name'], $change); Group::addMember($group['id'], $change);
} }
$members = Contact::getByGroupId($group['id']); $members = Contact::getByGroupId($group['id']);