From f84b9e65e47d1964a7f4794d3d0faff19c261589 Mon Sep 17 00:00:00 2001 From: Tony Butler Date: Tue, 12 Aug 2014 17:25:38 +0100 Subject: [PATCH] MDL-46792 core_group: Check that $data->name is set before trimming Signed-off-by: Tony Butler --- group/lib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/group/lib.php b/group/lib.php index ea791de5766..c3389116233 100644 --- a/group/lib.php +++ b/group/lib.php @@ -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) {