From: Sem <sembrestels@riseup.net>
Date: Fri, 23 Aug 2013 03:34:02 +0000 (-0400)
Subject: Merge branch '1.8' of gitorious.org:lorea/friendrequest into 1.8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a399defd074e38191eb2c14258110bb2002e3333;p=lorea%2Felgg.git

Merge branch '1.8' of gitorious.org:lorea/friendrequest into 1.8

Conflicts:
	actions/friends/add.php
	actions/friends/remove.php
---

a399defd074e38191eb2c14258110bb2002e3333
diff --cc actions/friends/add.php
index 3e1c9b2d4,38c29448b..c464a8162
--- a/actions/friends/add.php
+++ b/actions/friends/add.php
@@@ -1,15 -1,21 +1,23 @@@
  <?php
  /**
+  * Elgg add friend action
+  *
+  * @package Elgg.Core
+  * @subpackage Friends.Management
 + * @override actions/friends/add.php
   */
  
- $friend = get_entity(sanitize_int(get_input('friend')));
- $user = elgg_get_logged_in_user_entity();
 +
- if(!elgg_instanceof($friend, 'user')){
- 	register_error(elgg_echo('friendrequest:add:failure'));
+ // Get the GUID of the user to friend
+ $friend_guid = get_input('friend');
+ $friend = get_entity($friend_guid);
+ if (!$friend) {
+ 	register_error(elgg_echo('error:missing_data'));
  	forward(REFERER);
  }
+ $user = elgg_get_logged_in_user_entity();
+ 
+ $errors = false;
  
  if(check_entity_relationship($friend->guid, "friendrequest", $user->guid)
  	|| check_entity_relationship($friend->guid, "friend", $user->guid)) {
diff --cc actions/friends/remove.php
index 76716ebe6,786f08352..936f6f43b
--- a/actions/friends/remove.php
+++ b/actions/friends/remove.php
@@@ -1,27 -1,35 +1,36 @@@
  <?php
  /**
+  * Elgg remove friend action
+  *
+  * @package Elgg.Core
+  * @subpackage Friends.Management
 + * @override actions/friends/remove.php
   */
  
- $friend = get_entity(sanitize_int(get_input('friend')));
- $user = elgg_get_logged_in_user_entity();
+ // Get the GUID of the user to friend
+ $friend_guid = get_input('friend');
+ $friend = get_entity($friend_guid);
+ $errors = false;
  
- if(!elgg_instanceof($friend, 'user')){
- 	register_error(elgg_echo('friends:remove:failure', array($friend->name)));
- 	forward(REFERER);
+ // Get the user
+ 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());
+ 		elgg_set_ignore_access($ia);
+ 	} else {
+ 		register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+ 		$errors = true;
+ 	}
+ } catch (Exception $e) {
+ 	register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+ 	$errors = true;
  }
  
- if(check_entity_relationship($user->guid, "friend", $friend->guid)) {
- 	try {
- 		$user->removeFriend($friend->guid);
- 		if(check_entity_relationship($friend->guid, "friend", $user->guid)){
- 			$friend->removeFriend($user->guid);
- 		}
- 	} catch (Exception $e) {
- 		register_error(elgg_echo('friends:remove:failure', array($friend->name)));
- 		forward(REFERER);
- 	}
+ if (!$errors) {
+ 	system_message(elgg_echo("friends:remove:successful", array($friend->name)));
  }
  
- system_message(elgg_echo('friends:remove:successful', array($friend->name)));
+ // Forward back to the page you made the friend on
  forward(REFERER);