MDL-11759 group edit cleanup; merged from MOODLE_18_STABLE

safatshahin · Jan 18, 2008 · 3980c30 · 3980c30
1 parent 4559ab3
commit 3980c30
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/group/group.php b/group/group.php
@@ -23,6 +23,7 @@
     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
@@ -22,6 +22,7 @@
     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
@@ -149,7 +149,7 @@
         }
         $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 @@
             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);