Fixed add and remove friend actions.

diff --git a/actions/friends/add.php b/actions/friends/add.php
index c464a8162b839340bd507a188b8944c2a8a129f5..e6efe1db10fd5b45d28a2fd6067de4b1c3bc8766 100644 (file)
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@ -26,7 +26,13 @@ if(check_entity_relationship($friend->guid, "friendrequest", $user->guid)
                if (!$user->addFriend($friend_guid)) {
                        $errors = true;
                }
-               remove_entity_relationship($friend->guid, "friendrequest", $user->guid);
+    
+        $ia = elgg_set_ignore_access(true);
+        $friend->addFriend($user->guid);
+        elgg_set_ignore_access($ia);
+       
+        remove_entity_relationship($friend->guid, "friendrequest", $user->guid);
+    
        } catch (Exception $e) {
                register_error(elgg_echo("friends:add:failure", array($friend->name)));
                $errors = true;

diff --git a/actions/friends/remove.php b/actions/friends/remove.php
index 936f6f43bd23d9a9b57a5cc635cb495709a0957b..62bccb8912e1409d917dcddca546e1d59b71a1e6 100644 (file)
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@ -17,7 +17,7 @@ try{
        if ($friend instanceof ElggUser) {
                elgg_get_logged_in_user_entity()->removeFriend($friend_guid);
                $ia = elgg_set_ignore_access(true);
-               $friend->removeFriend($elgg_get_logged_in_user_guid());
+               $friend->removeFriend(elgg_get_logged_in_user_guid());
                elgg_set_ignore_access($ia);
        } else {
                register_error(elgg_echo("friends:remove:failure", array($friend->name)));