diff options
Diffstat (limited to 'actions/friends/remove.php')
| -rw-r--r-- | actions/friends/remove.php | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/actions/friends/remove.php b/actions/friends/remove.php index 83dd377e6..d69d18f31 100644 --- a/actions/friends/remove.php +++ b/actions/friends/remove.php @@ -2,16 +2,10 @@ /** * Elgg remove friend action * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ + * @package Elgg.Core + * @subpackage Friends.Management */ -// Ensure we are logged in -gatekeeper(); -action_gatekeeper(); - // Get the GUID of the user to friend $friend_guid = get_input('friend'); $friend = get_entity($friend_guid); @@ -20,19 +14,19 @@ $errors = false; // Get the user try{ if ($friend instanceof ElggUser) { - $_SESSION['user']->removeFriend($friend_guid); - } else{ - register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name)); + elgg_get_logged_in_user_entity()->removeFriend($friend_guid); + } else { + register_error(elgg_echo("friends:remove:failure", array($friend->name))); $errors = true; } } catch (Exception $e) { - register_error(sprintf(elgg_echo("friends:remove:failure"), $friend->name)); + register_error(elgg_echo("friends:remove:failure", array($friend->name))); $errors = true; } if (!$errors) { - system_message(sprintf(elgg_echo("friends:remove:successful"), $friend->name)); + system_message(elgg_echo("friends:remove:successful", array($friend->name))); } -// Forward to the user friends page -forward("pg/friends/" . $_SESSION['user']->username . "/"); +// Forward back to the page you made the friend on +forward(REFERER); |