From: skodak <skodak>
Date: Fri, 18 Jan 2008 10:16:39 +0000 (+0000)
Subject: MDL-11759 group edit cleanup; merged from MOODLE_18_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3980c306b1d556c895b075712449ceb0f09d83c5;p=moodle.git

MDL-11759 group edit cleanup; merged from MOODLE_18_STABLE
---

diff --git a/group/group.php b/group/group.php
index d638126e7c..db3c508b2b 100644
--- a/group/group.php
+++ b/group/group.php
@@ -23,6 +23,7 @@ if ($id) {
     if (!$group = get_record('groups', 'id', $id)) {
         error('Group ID was incorrect');
     }
+    $group->description = clean_text($group->description);
     if (empty($courseid)) {
         $courseid = $group->courseid;
 
diff --git a/group/grouping.php b/group/grouping.php
index 760d581ea3..12a3c398e2 100644
--- a/group/grouping.php
+++ b/group/grouping.php
@@ -22,6 +22,7 @@ if ($id) {
     if (!$grouping = get_record('groupings', 'id', $id)) {
         error('Group ID was incorrect');
     }
+    $grouping->description = clean_text($grouping->description);
     if (empty($courseid)) {
         $courseid = $grouping->courseid;
 
diff --git a/group/overview.php b/group/overview.php
index 7ce31cf1b9..737f1a405c 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -149,7 +149,7 @@ foreach ($members as $gpgid=>$groupdata) {
         }
         $line = array();
         $name = format_string($groups[$gpid]->name);
-        $jsdescription = addslashes_js(trim($groups[$gpid]->description));
+        $jsdescription = addslashes_js(trim(format_text($groups[$gpid]->description)));
         if (empty($jsdescription)) {
             $line[] = $name;
         } else {
@@ -174,7 +174,7 @@ foreach ($members as $gpgid=>$groupdata) {
             print_heading($strnotingrouping, '', 3);
         } else {
             print_heading(format_string($groupings[$gpgid]->name), '', 3);
-            print_box($groupings[$gpgid]->description, 'generalbox boxwidthnarrow boxaligncenter');
+            print_box(format_text($groupings[$gpgid]->description), 'generalbox boxwidthnarrow boxaligncenter');
         }
     }
     print_table($table, false);