Merged 5487:5525 from 1.7 to trunk.

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

3 files changed, 5 insertions, 2 deletions

diff --git a/mod/groups/actions/edit.php b/mod/groups/actions/edit.php
index b6eb3eb71..72cc66e85 100644
--- a/mod/groups/actions/edit.php
+++ b/mod/groups/actions/edit.php
@@ -16,6 +16,9 @@
 	$input = array();
 	foreach($CONFIG->group as $shortname => $valuetype) {
 		$input[$shortname] = get_input($shortname);
+		if ($shortname == 'name') {
+			$input[$shortname] = strip_tags($input[$shortname]);
+		}
 		if ($valuetype == 'tags')
 			$input[$shortname] = string_to_tag_array($input[$shortname]);
 	}
diff --git a/mod/groups/actions/forums/addtopic.php b/mod/groups/actions/forums/addtopic.php
index 740ea17aa..085e2196e 100644
--- a/mod/groups/actions/forums/addtopic.php
+++ b/mod/groups/actions/forums/addtopic.php
@@ -18,7 +18,7 @@
 	    if (!$group_entity->isMember($vars['user'])) forward();
 	    
 	// Get input data
-	    $title = get_input('topictitle');
+	    $title = strip_tags(get_input('topictitle'));
 		$message = get_input('topicmessage');
 		$tags = get_input('topictags');
 		$access = get_input('access_id');
diff --git a/mod/groups/actions/forums/edittopic.php b/mod/groups/actions/forums/edittopic.php
index 2898c31dc..10b54ed61 100644
--- a/mod/groups/actions/forums/edittopic.php
+++ b/mod/groups/actions/forums/edittopic.php
@@ -19,7 +19,7 @@
      
 
 	// Get input data
-	    $title = get_input('topictitle');
+	    $title = strip_tags(get_input('topictitle'));
 		$message = get_input('topicmessage');
 		$message_id = get_input('message_id');
 		$tags = get_input('topictags');