MDL-11759 group edit cleanup; merged from MOODLE_18_STABLE

This commit is contained in:
skodak 2008-01-18 10:16:39 +00:00
parent 4559ab345f
commit 3980c306b1
3 changed files with 4 additions and 2 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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);