From a6e8eb522323fa2e3f2c1fd6e58a3eec9857db63 Mon Sep 17 00:00:00 2001
From: dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Feb 2009 11:01:02 +0000
Subject: new join group river view added

git-svn-id: https://code.elgg.org/elgg/trunk@2876 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/groups/actions/join.php                     |  4 +++-
 mod/groups/languages/en.php                     |  2 +-
 mod/groups/views/default/river/group/create.php | 13 +++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 mod/groups/views/default/river/group/create.php

diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php
index 6d55d3636..7e55306f5 100644
--- a/mod/groups/actions/join.php
+++ b/mod/groups/actions/join.php
@@ -35,7 +35,9 @@
 				// Remove any invite or join request flags
 				remove_metadata($user->guid, 'group_invite', $group->guid);
 				remove_metadata($user->guid, 'group_join_request', $group->guid);
-				
+				// add to river
+	        	add_to_river('river/group/create','join',$user->guid,$group->guid);
+	        	
 				forward($group->getURL());
 				exit;
 			}
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 22aff6a1d..ef45d5f57 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -170,7 +170,7 @@ or click below to confirm request:
 			'groupforum:river:posted' => '%s has posted a new comment',
 			'groupforum:river:annotate:create' => 'on this discussion topic',
 
-			'groups:river:member' => 'is now a member of',
+			'groups:river:member' => '%s is now a member of',
 	
 			'groups:nowidgets' => 'No widgets have been defined for this group.',
 	
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
new file mode 100644
index 000000000..48c69f99f
--- /dev/null
+++ b/mod/groups/views/default/river/group/create.php
@@ -0,0 +1,13 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$objecturl = $object->getURL();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groups:river:member"),$url) . " ";
+	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
+	
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
-- 
cgit v1.2.3