diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2012-04-22 16:41:46 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2012-04-22 16:41:46 -0700 |
| commit | 6653c1f66bca719426965d12235f08b05deed187 (patch) | |
| tree | 7f9ff091bdda7e525b48043511924577383a0330 | |
| parent | 97ad74c50ebcf60971208ac20daa7990c3d38c69 (diff) | |
| parent | d073c8861d2f91dff98ac58130d688cec0bb499a (diff) | |
| download | elgg-6653c1f66bca719426965d12235f08b05deed187.tar.gz elgg-6653c1f66bca719426965d12235f08b05deed187.tar.bz2 | |
Merge branch '1.8' of github.com:Elgg/Elgg into 1.8
| -rw-r--r-- | engine/lib/users.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index f1d42e25e..6a881777e 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -969,8 +969,8 @@ $allow_multiple_emails = false, $friend_guid = 0, $invitecode = '') { $friend_user->addFriend($user->guid); // @todo Should this be in addFriend? - add_to_river('friends/river/create', 'friend', $user->getGUID(), $friend_guid); - add_to_river('friends/river/create', 'friend', $friend_guid, $user->getGUID()); + add_to_river('river/relationship/friend/create', 'friend', $user->getGUID(), $friend_guid); + add_to_river('river/relationship/friend/create', 'friend', $friend_guid, $user->getGUID()); } } } |