aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-07 14:39:10 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-07 14:39:10 +0000
commitc3f5333f8b02937d52031ff4d136737903f85919 (patch)
treec1d3e1ed9519324349b8671847997b9b14ea0d80 /mod
parentbd022ba6ff94729d6aec18f7fd40f913f51f84f9 (diff)
downloadelgg-c3f5333f8b02937d52031ff4d136737903f85919.tar.gz
elgg-c3f5333f8b02937d52031ff4d136737903f85919.tar.bz2
creating a new group now displays in the activity stream.
git-svn-id: http://code.elgg.org/elgg/trunk@6381 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/actions/edit.php4
-rw-r--r--mod/groups/languages/en.php1
-rw-r--r--mod/groups/views/default/river/group/create.php10
3 files changed, 10 insertions, 5 deletions
diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
index 361f81757..bc2530111 100644
--- a/mod/groups/actions/edit.php
+++ b/mod/groups/actions/edit.php
@@ -90,7 +90,9 @@ if (isset($CONFIG->group_tool_options)) {
}
}
-$group->save();
+if($group->save()){
+ add_to_river('river/group/create','create',$user->guid,$group->guid);
+}
// group creator needs to be member of new group
if ($new_group_flag) {
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 8a6691474..d0f8f3239 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -182,6 +182,7 @@ or click below to view the group's join requests:
*/
'groups:river:member' => 'is now a member of',
+ 'groups:river:created' => '%s created a new group called',
'groupforum:river:updated' => '%s has updated',
'groupforum:river:update' => 'this discussion topic',
'groupforum:river:created' => '%s has created',
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index e96bb9b34..95a9c38d6 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -5,9 +5,11 @@
$objecturl = $object->getURL();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("groups:river:member"),$url) . " ";
+ $string = sprintf(elgg_echo("groups:river:created"),$url) . " ";
$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-
-?>
+ $string .= " <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> ";
+ if (isloggedin()) {
+ $string .= elgg_view('likes/forms/link', array('entity' => $object));
+ }
-<?php echo $string; ?> \ No newline at end of file
+echo $string; \ No newline at end of file