MDL-11759 group edit cleanup; merged from MOODLE_18_STABLE

diff --git a/group/group.php b/group/group.php
index d638126e7c8bba0ee9ad3a37a0fb457bc9e18d37..db3c508b2b64008d1d8bad3245c5876f609a6cc0 100644 (file)
--- 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 760d581ea38fe5f63d5053391f397838914fc7e3..12a3c398e229bee7dd9d78775ccaf85187b2f447 100644 (file)
--- 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 7ce31cf1b97732b4d1e90de66e32f89f3d9536e5..737f1a405c46b8e3c29b20356cd1a75980cbf236 100644 (file)
--- 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);