Merged 1.7 bugfixes back into core. (5376:HEAD).

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

7 files changed, 45 insertions, 12 deletions

diff --git a/mod/groups/actions/groupskillinvitation.php b/mod/groups/actions/groupskillinvitation.php
index 78c920df0..df265475e 100644
--- a/mod/groups/actions/groupskillinvitation.php
+++ b/mod/groups/actions/groupskillinvitation.php
@@ -24,7 +24,7 @@
 			if (check_entity_relationship($group->guid, 'invited', $user->guid))
 			{
 				remove_entity_relationship($group->guid, 'invited', $user->guid);
-				system_message(elgg_echo("groups:joinrequestkilled"));
+				system_message(elgg_echo("groups:invitekilled"));
 			}
 
 	forward($_SERVER['HTTP_REFERER']);
diff --git a/mod/groups/all.php b/mod/groups/all.php
index c4347c1e4..d397abe2f 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -26,8 +26,9 @@
 	
 	set_context('search');
 	if ($tag != "") {
+		$filter = 'search';
 		// groups plugin saves tags as "interests" - see groups_fields_setup() in start.php
-		$objects = list_entities_from_metadata('interests',$tag,'group',"","", $limit, false);
+		$objects = list_entities_from_metadata('interests',$tag,'group',"","", $limit, false, false, true, false);
 	} else {
 		switch($filter){
 			case "newest":
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index 25e917dcb..e681e1294 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -150,9 +150,10 @@
 			'groups:invite:subject' => "%s you have been invited to join %s!",
 			'groups:started' => "Started by",
 			'groups:joinrequest:remove:check' => 'Are you sure you want to remove this join request?',
+			'groups:invite:remove:check' => 'Are you sure you want to remove this invite?',
 			'groups:invite:body' => "Hi %s,
 
-%s invited you to join the '%s' group, click below to confirm:
+%s invited you to join the '%s' group. Click below to view your invitations:
 
 %s",
 
@@ -166,11 +167,11 @@ You are now a member of the '%s' group! Click below to begin posting!
 			'groups:request:subject' => "%s has requested to join %s",
 			'groups:request:body' => "Hi %s,
 
-%s has requested to join the '%s' group, click below to view their profile:
+%s has requested to join the '%s' group. Click below to view their profile:
 
 %s
 
-or click below to confirm request:
+or click below to view the group's join requests:
 
 %s",
 
@@ -221,6 +222,7 @@ or click below to confirm request:
 			'grouppost:nopost' => 'Empty post',
 			'groups:deletewarning' => "Are you sure you want to delete this group? There is no undo!",
 
+			'groups:invitekilled' => 'The invite has been deleted.',
 			'groups:joinrequestkilled' => 'The join request has been deleted.',
 	);
 
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php
index 5032a74fb..534469052 100644
--- a/mod/groups/views/default/groups/find.php
+++ b/mod/groups/views/default/groups/find.php
@@ -8,11 +8,7 @@ $tag_string = elgg_echo('groups:search:tags');
 	 
 ?>
 <h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
-<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/search/" method="get">
+<form id="groupsearchform" action="<?php echo $vars['url']; ?>pg/groups/world/" method="get">
 	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
-	<input type="hidden" name="entity_type" value="group" />
-	<input type="hidden" name="subtype" value="" />
-	<input type="hidden" name="tagtype" value="" />
-	<input type="hidden" name="owner_guid" value="0" />
 	<input type="submit" value="<?php echo elgg_echo('go'); ?>" />
 </form>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index ddc8a057a..135bf1940 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -22,7 +22,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 			<?php		
 				echo str_replace('<a', '<a class="action_button disabled" ', elgg_view('output/confirmlink',array(
 					'href' => $vars['url'] . "action/groups/killinvitation?user_guid={$user->getGUID()}&group_guid={$group->getGUID()}",
-					'confirm' => elgg_echo('groups:joinrequest:remove:check'),
+					'confirm' => elgg_echo('groups:invite:remove:check'),
 					'text' => elgg_echo('delete'),
 				)));
 			
diff --git a/mod/groups/views/rss/groups/profileitems.php b/mod/groups/views/rss/groups/profileitems.php
index 8ae4db971..1f6688d68 100644
--- a/mod/groups/views/rss/groups/profileitems.php
+++ b/mod/groups/views/rss/groups/profileitems.php
@@ -11,7 +11,7 @@
 	 */
 	 
 	 //right column
-	 if ($forae = elgg_get_entities(array('types' => 'object', 'owner_guid' => $vars['entity']->guid))) {
+	 if ($forae = elgg_get_entities(array('types' => 'object', 'container_guid' => $vars['entity']->guid))) {
 	 	foreach($forae as $forum)
 	 		echo elgg_view_entity($forum);
 	 }
diff --git a/mod/groups/views/rss/object/groupforumtopic.php b/mod/groups/views/rss/object/groupforumtopic.php
new file mode 100644
index 000000000..765d315ee
--- /dev/null
+++ b/mod/groups/views/rss/object/groupforumtopic.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Elgg groupforumtopic view
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$title = $vars['entity']->title;
+
+$body = '';
+$annotation = $vars['entity']->getAnnotations('group_topic_post', 1, 0, "asc");
+if (count($annotation == 1)) {
+	$body = $annotation[0]->value;
+}
+?>
+
+<item>
+<guid isPermaLink='true'><?php echo htmlspecialchars($vars['entity']->getURL()); ?></guid>
+<pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate>
+<link><?php echo htmlspecialchars($vars['entity']->getURL()); ?></link>
+<title><![CDATA[<?php echo $title; ?>]]></title>
+<description><![CDATA[<?php echo (autop($body)); ?>]]></description>
+<?php
+		$owner = $vars['entity']->getOwnerEntity();
+		if ($owner) {
+?>
+<dc:creator><?php echo $owner->name; ?></dc:creator>
+<?php
+		}
+?>
+</item>
\ No newline at end of file