Merged [6612] from 1.7 into the trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6844 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/upgrades/2010070301.php b/engine/lib/upgrades/2010070301.php
new file mode 100644 (file)
index 0000000..af5c804
--- /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 606c00ba7c35744ca086c2857bb107cf062719a0..75cc9354b16a3dbb4817f40f34ac170612aab1af 100644 (file)
--- 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 55da1a17c334d2255a505e33acabf6648a184995..5ba0bed7836139e91c3e704267aa979a1cc217fe 100644 (file)
--- 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 7ecd00f57477527f566254f07ef6af2adbc9989d..acd1c9f8b79e5bcc178810496475101c13319605 100644 (file)
--- 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 9617509746d623342e210358eb374bda89f0b8f7..aa9fef47a7e036a0642724932a0f310939ed400e 100644 (file)
--- 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 e5e318ce0d526e5f1520e9e776dc466e715dc666..a568920cca02311cf1bc771de74c5a7ad6c1a0d3 100644 (file)
--- 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 e8dd540f7f9c52f96c0216906e8ac1c736728fdd..60ce3d11b050f76db66512e4f291a1c1512954c0 100644 (file)
--- 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';