mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 00:12:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46792-master' of https://github.com/lucisgit/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2014-08-19 13:57:50 +08:00
commit 32d3bfa2de
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
group/lib.php
View File

@ -375,7 +375,9 @@ function groups_update_group($data, $editform = false, $editoroptions = false) {
$context = context_course::instance($data->courseid);
$data->timemodified = time();
$data->name = trim($data->name);
if (isset($data->name)) {
$data->name = trim($data->name);
}
if (isset($data->idnumber)) {
$data->idnumber = trim($data->idnumber);
if (($existing = groups_get_group_by_idnumber($data->courseid, $data->idnumber)) && $existing->id != $data->id) {
@ -420,7 +422,9 @@ function groups_update_group($data, $editform = false, $editoroptions = false) {
function groups_update_grouping($data, $editoroptions=null) {
global $DB;
$data->timemodified = time();
$data->name = trim($data->name);
if (isset($data->name)) {
$data->name = trim($data->name);
}
if (isset($data->idnumber)) {
$data->idnumber = trim($data->idnumber);
if (($existing = groups_get_grouping_by_idnumber($data->courseid, $data->idnumber)) && $existing->id != $data->id) {