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

diff --git a/include/api.php b/include/api.php
index 8a29c82dd8a4174f4a60da9ae786320b23b57847..52910d47273bba9c3e89aa70d84a58e7fa419702 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -4783,7 +4783,7 @@ function api_friendica_group_create($type)
                        intval($uid)
                );
                if (count($contact))
-                       $result = Group::create_member($uid, $name, $cid, $gid);
+                       $result = Group::addMember($gid, $cid);
                else {
                        $erroraddinguser = true;
                        $errorusers[] = $cid;
@@ -4846,7 +4846,7 @@ function api_friendica_group_update($type)
                );
 
                if (count($contact)) {
-                       $result = Group::create_member($uid, $name, $cid, $gid);
+                       $result = Group::addMember($gid, $cid);
                } else {
                        $erroraddinguser = true;
                        $errorusers[] = $cid;

diff --git a/mod/group.php b/mod/group.php
index ba7c24c56a375aa35a05d51d0e975013fad8531a..8a6e9309f1f87aea7e326e704e5264c39bc73ded 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -174,7 +174,7 @@ function group_content(App $a) {
                        if (in_array($change, $preselected)) {
                                Group::removeMember($group['id'], $change);
                        } else {
-                               Group::create_member(local_user(), $group['name'], $change);
+                               Group::addMember($group['id'], $change);
                        }
 
                        $members = Contact::getByGroupId($group['id']);