diff options
| author | dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-21 07:07:31 +0000 |
|---|---|---|
| committer | dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-02-21 07:07:31 +0000 |
| commit | 3423c236699e1f21666a6f3e22a4b3d60e0f3909 (patch) | |
| tree | b2383a374b82fb981458e4ba36ebf44b5e6b6a20 | |
| parent | 9732dc7b1a96bc90ac21c29a222633af220ddb3f (diff) | |
| download | elgg-3423c236699e1f21666a6f3e22a4b3d60e0f3909.tar.gz elgg-3423c236699e1f21666a6f3e22a4b3d60e0f3909.tar.bz2 | |
new friend river view and action committed
git-svn-id: https://code.elgg.org/elgg/trunk@2874 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | actions/friends/add.php | 5 | ||||
| -rw-r--r-- | languages/en.php | 2 | ||||
| -rw-r--r-- | views/default/friends/river/create.php | 15 |
3 files changed, 20 insertions, 2 deletions
diff --git a/actions/friends/add.php b/actions/friends/add.php index e87597649..9dd8397bc 100644 --- a/actions/friends/add.php +++ b/actions/friends/add.php @@ -27,8 +27,11 @@ register_error(sprintf(elgg_echo("friends:add:failure"),$friend->name));
$errors = true;
}
- if (!$errors)
+ if (!$errors){
+ // add to river
+ add_to_river('friends/river/create','friend',$_SESSION['user']->guid,$friend_guid);
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/languages/en.php b/languages/en.php index 38e4cdafc..09da1d9c3 100644 --- a/languages/en.php +++ b/languages/en.php @@ -353,7 +353,7 @@ To remove a widget drag it back to the <b>Widget gallery</b>.", 'friends:river:created' => "%s added the friends widget.",
'friends:river:updated' => "%s updated their friends widget.",
'friends:river:delete' => "%s removed their friends widget.",
- 'friends:river:add' => "%s add someone as a friend.",
+ 'friends:river:add' => "%s is now a friend with",
'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php new file mode 100644 index 000000000..ab618d90d --- /dev/null +++ b/views/default/friends/river/create.php @@ -0,0 +1,15 @@ +<?php
+
+ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+ $performed_on = get_entity($vars['item']->object_guid);
+ $url = $performed_on->getURL();
+
+ $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+ $string = sprintf(elgg_echo("friends:river:add"),$url) . " ";
+ $string .= "<a href=\"{$performed_on->getURL()}\">{$performed_on->name}</a>";
+
+?>
+
+<?php
+ echo $string;
+?>
\ No newline at end of file |