diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-16 17:41:45 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-16 17:41:45 +0000 |
| commit | cedf4df823b9f79fcf58dbefdedb28ceeb350dc2 (patch) | |
| tree | 79a9878a1ac5199927fd1f6e0f6cedbcb3f8bd0a | |
| parent | 883ffca4fd31c2b7a88bc64799c25bc689caa779 (diff) | |
| download | elgg-cedf4df823b9f79fcf58dbefdedb28ceeb350dc2.tar.gz elgg-cedf4df823b9f79fcf58dbefdedb28ceeb350dc2.tar.bz2 | |
Add and remove friend actions now use try / catch
git-svn-id: https://code.elgg.org/elgg/trunk@1445 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | actions/friends/add.php | 15 | ||||
| -rw-r--r-- | actions/friends/remove.php | 14 |
2 files changed, 15 insertions, 14 deletions
diff --git a/actions/friends/add.php b/actions/friends/add.php index f51aacefd..760da81b7 100644 --- a/actions/friends/add.php +++ b/actions/friends/add.php @@ -18,16 +18,17 @@ $friend_guid = get_input('friend');
$friend = get_entity($friend_guid);
+ $errors = false;
+
// Get the user
- if ($_SESSION['user']->addFriend($friend_guid)) {
-
- system_message(sprintf(elgg_echo("friends:add:successful"),$friend->name));
-
- } else {
-
+ try {
+ $_SESSION['user']->addFriend($friend_guid);
+ } catch (Exception $e) {
register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name));
-
+ $errors = true;
}
+ if (!$errors)
+ system_message(sprintf(elgg_echo("friends:add:successful"),$friend->name));
// Forward to the user friends page
forward("pg/friends/" . $_SESSION['user']->username . "/");
diff --git a/actions/friends/remove.php b/actions/friends/remove.php index 66ed020a5..3d024b9d1 100644 --- a/actions/friends/remove.php +++ b/actions/friends/remove.php @@ -17,17 +17,17 @@ // Get the GUID of the user to friend
$friend_guid = get_input('friend');
$friend = get_entity($friend_guid);
+ $errors = false;
// Get the user
- if ($_SESSION['user']->removeFriend($friend_guid) && get_class($friend) == "ElggUser") {
-
- system_message(sprintf(elgg_echo("friends:remove:successful"),$friend->name));
-
- } else {
-
+ try{
+ $_SESSION['user']->removeFriend($friend_guid) && get_class($friend) == "ElggUser";
+ } catch (Exception $e) {
register_error(sprintf(elgg_echo("friends:remove:failure"),$friend->name));
-
+ $errors = true;
}
+ if (!$errors)
+ system_message(sprintf(elgg_echo("friends:remove:successful"),$friend->name));
// Forward to the user friends page
forward("pg/friends/" . $_SESSION['user']->username . "/");
|