diff options
| author | Sem <sembrestels@riseup.net> | 2011-12-08 21:19:02 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-12-08 21:19:02 +0100 |
| commit | ab09c2001bd9384c4e3c2964c5d1a39a0e91b013 (patch) | |
| tree | 6289b43f110fee228b50118ee8e7b6beeb0b336a /actions | |
| parent | 5c4dc1474ae89437f52101039f1452c267c252a7 (diff) | |
| download | elgg-ab09c2001bd9384c4e3c2964c5d1a39a0e91b013.tar.gz elgg-ab09c2001bd9384c4e3c2964c5d1a39a0e91b013.tar.bz2 | |
Arranged page to see friend requests.
Diffstat (limited to 'actions')
| -rw-r--r--[-rwxr-xr-x] | actions/friendrequest/decline.php | 4 | ||||
| -rw-r--r-- | actions/friends/remove.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/actions/friendrequest/decline.php b/actions/friendrequest/decline.php index 5b48acfb4..247023c60 100755..100644 --- a/actions/friendrequest/decline.php +++ b/actions/friendrequest/decline.php @@ -4,9 +4,9 @@ $user = elgg_get_logged_in_user_entity(); $friend = get_entity(sanitize_int(get_input("guid")));
if(remove_entity_relationship($friend->guid, 'friendrequest', $user->guid)) {
- system_message(elgg_echo("friendrequest:remove:success"));
+ system_message(elgg_echo("friendrequest:decline:success", array($user->name)));
} else {
- system_message(elgg_echo("friendrequest:remove:fail"));
+ system_message(elgg_echo("friendrequest:decline:fail"));
}
forward(REFERER);
diff --git a/actions/friends/remove.php b/actions/friends/remove.php index 4ba7bc572..1ad9471b3 100644 --- a/actions/friends/remove.php +++ b/actions/friends/remove.php @@ -4,7 +4,7 @@ $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:remove:failure', array($friend->name))); + register_error(elgg_echo('friends:remove:failure', array($friend->name))); forward(REFERER); } @@ -15,10 +15,10 @@ if(check_entity_relationship($user->guid, "friend", $friend->guid)) { $friend->removeFriend($user->guid); } } catch (Exception $e) { - register_error(elgg_echo('friendrequest:remove:failure', array($friend->name))); + register_error(elgg_echo('friends:remove:failure', array($friend->name))); forward(REFERER); } } -system_message(elgg_echo('friendrequest:remove:successful', array($friend->name))); +system_message(elgg_echo('friends:remove:successful', array($friend->name))); forward(REFERER); |