diff options
| -rw-r--r-- | engine/lib/upgrades/2010070301.php | 9 | ||||
| -rw-r--r-- | mod/groups/actions/edit.php | 2 | ||||
| -rw-r--r-- | mod/groups/actions/join.php | 2 | ||||
| -rw-r--r-- | mod/groups/languages/en.php | 7 | ||||
| -rw-r--r-- | mod/groups/views/default/river/group/create.php | 2 | ||||
| -rw-r--r-- | mod/groups/views/default/river/relationship/member/create.php | 50 | ||||
| -rw-r--r-- | version.php | 2 |
7 files changed, 28 insertions, 46 deletions
diff --git a/engine/lib/upgrades/2010070301.php b/engine/lib/upgrades/2010070301.php new file mode 100644 index 000000000..af5c80419 --- /dev/null +++ b/engine/lib/upgrades/2010070301.php @@ -0,0 +1,9 @@ +<?php + +/** + * Group join river view has been renamed + */ + +$query = "UPDATE {$CONFIG->dbprefix}river SET view='river/relationship/member/create' + WHERE view='river/group/create' AND action_type='join'"; +update_data($query); diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php index 606c00ba7..75cc9354b 100644 --- a/mod/groups/actions/edit.php +++ b/mod/groups/actions/edit.php @@ -96,7 +96,7 @@ $group->save(); if ($new_group_flag) { set_page_owner($group->guid); $group->join($user); - add_to_river('river/group/create','create',$user->guid,$group->guid); + add_to_river('river/group/create', 'create', $user->guid, $group->guid); } diff --git a/mod/groups/actions/join.php b/mod/groups/actions/join.php index 55da1a17c..5ba0bed78 100644 --- a/mod/groups/actions/join.php +++ b/mod/groups/actions/join.php @@ -43,7 +43,7 @@ remove_entity_relationship($user->guid, 'membership_request', $group->guid); // add to river - add_to_river('river/group/create','join',$user->guid,$group->guid); + add_to_river('river/relationship/member/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 7ecd00f57..acd1c9f8b 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -181,17 +181,16 @@ or click below to view the group's join requests: Forum river items */ - 'groups:river:member' => 'is now a member of', - 'groups:river:created' => '%s created a new group called', + 'groups:river:member' => '%s is now a member of', + 'groups:river:create' => '%s created a new group called', 'groupforum:river:updated' => '%s has updated', 'groupforum:river:update' => 'this discussion topic', 'groupforum:river:created' => '%s has created', 'groupforum:river:create' => 'a new discussion topic titled', - 'groupforum:river:posted' => '%s has posted a comment', + 'groupforum:river:posted' => '%s has posted a new comment', 'groupforum:river:annotate:create' => 'on this discussion topic', 'groupforumtopic:river:annotate' => 'a new comment on this discussion topic', 'groupforum:river:postedtopic' => '%s has started a new discussion topic titled', - 'groups:river:member' => '%s is now a member of', 'groups:river:togroup' => 'to the group', '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 index 961750974..aa9fef47a 100644 --- a/mod/groups/views/default/river/group/create.php +++ b/mod/groups/views/default/river/group/create.php @@ -5,7 +5,7 @@ $objecturl = $object->getURL(); $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("groups:river:created"),$url) . " "; + $string = sprintf(elgg_echo("groups:river:create"), $url) . " "; $string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>"; $string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created); if (isloggedin()) { diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php index e5e318ce0..a568920cc 100644 --- a/mod/groups/views/default/river/relationship/member/create.php +++ b/mod/groups/views/default/river/relationship/member/create.php @@ -1,40 +1,14 @@ <?php - /** - * Elgg relationship create event for groups - * Display something in the river when a group is joined - * - * @package ElggGroups - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - $statement = $vars['statement']; - - $performed_by = $statement->getSubject(); - $event = $statement->getEvent(); - $object = $statement->getObject(); - - if (is_array($object)) - { - switch ($object['relationship']) - { - // Friending - case 'member' : - $user = $object['subject']; - $group = $object['object']; - - if (($user instanceof ElggUser) && ($group instanceof ElggGroup)) - { - echo "<a href=\"{$user->getURL()}\">{$user->name}</a> "; - echo elgg_echo("groups:river:member"); - echo " '<a href=\"{$group->getURL()}\">{$group->name}</a>'"; - } - - break; - } - } - - -?>
\ No newline at end of file + $performed_by = get_entity($vars['item']->subject_guid); + $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>"; + $string .= " <span class='entity_subtext'>". elgg_view_friendly_time($vars['item']->posted); + $string .= "</span>"; +?> + +<?php echo $string; ?>
\ No newline at end of file diff --git a/version.php b/version.php index e8dd540f7..60ce3d11b 100644 --- a/version.php +++ b/version.php @@ -12,7 +12,7 @@ // YYYYMMDD = Elgg Date // XX = Interim incrementer -$version = 2010062401; +$version = 2010070301; // Human-friendly version name $release = '1.8-svn'; |