diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 18:08:53 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 18:08:53 +0000 |
| commit | 5a396908110b8d9ae358224f15bdbcb9a6c6dfab (patch) | |
| tree | 985f436b57828fbaae1321567a1dceed7d3eec8a /mod/groups/actions | |
| parent | 613748b75a9cd1f1b1939ab05c22e63407237984 (diff) | |
| download | elgg-5a396908110b8d9ae358224f15bdbcb9a6c6dfab.tar.gz elgg-5a396908110b8d9ae358224f15bdbcb9a6c6dfab.tar.bz2 | |
Merged [6612] from 1.7 into the trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6844 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/actions')
| -rw-r--r-- | mod/groups/actions/edit.php | 2 | ||||
| -rw-r--r-- | mod/groups/actions/join.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php index 606c00ba7..75cc9354b 100644 --- a/mod/groups/actions/edit.php +++ b/mod/groups/actions/edit.php @@ -96,7 +96,7 @@ $group->save(); if ($new_group_flag) { set_page_owner($group->guid); $group->join($user); - add_to_river('river/group/create','create',$user->guid,$group->guid); + add_to_river('river/group/create', 'create', $user->guid, $group->guid); } diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php index 55da1a17c..5ba0bed78 100644 --- a/mod/groups/actions/join.php +++ b/mod/groups/actions/join.php @@ -43,7 +43,7 @@ remove_entity_relationship($user->guid, 'membership_request', $group->guid); // add to river - add_to_river('river/group/create','join',$user->guid,$group->guid); + add_to_river('river/relationship/member/create','join',$user->guid,$group->guid); forward($group->getURL()); exit; |