Merge remote-tracking branch 'upstream/develop' into dbstructure-class
This commit is contained in:
commit
cf56de1e77
|
@ -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;
|
||||||
|
|
|
@ -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']);
|
||||||
|
|
Loading…
Reference in a new issue